induction_cannon_01 0.0.1 → 0.0.2

data/Gemfile

@@ -3,7 +3,9 @@ source 'http://rubygems.org'
 gem 'rails', '3.0.5'
 
 gem 'mysql2'
-gem 'dragoon_system', :git => "git@github.com:toward7seas01/dragoon_system.git"
+#gem 'dragoon_system', :git => "git@github.com:toward7seas01/dragoon_system.git"
+#gem 'dragoon_system', :path => '~/dragoon_system'
+gem 'dragoon_system', "0.1.3"
 
 
 group :development do

data/Gemfile.lock

@@ -1,10 +1,3 @@
-GIT
-  remote: git@github.com:toward7seas01/dragoon_system.git
-  revision: 5cd9f705c69e646f065f4c46a346229a83bea422
-  specs:
-    dragoon_system (0.1.2)
-      rails (~> 3.0.5)
-
 GEM
   remote: http://rubygems.org/
   specs:
@@ -62,6 +55,8 @@ GEM
     culerity (0.2.12)
     database_cleaner (0.6.0)
     diff-lcs (1.1.2)
+    dragoon_system (0.1.3)
+      rails (~> 3.0.5)
     erubis (2.6.6)
       abstract (>= 1.0.0)
     ffi (0.6.3)
@@ -148,7 +143,7 @@ DEPENDENCIES
   capybara (~> 0.4.0)
   cucumber-rails
   database_cleaner (~> 0.6.0)
-  dragoon_system!
+  dragoon_system (= 0.1.3)
   jeweler (~> 1.5.1)
   launchy
   mysql2

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/app/controllers/application_controller.rb

@@ -1,3 +1,4 @@
 class ApplicationController < ActionController::Base
   protect_from_forgery
+  
 end

data/app/controllers/blogs_controller.rb

@@ -0,0 +1,83 @@
+class BlogsController < ApplicationController
+  # GET /blogs
+  # GET /blogs.xml
+  def index
+    @blogs = Blog.all
+
+    respond_to do |format|
+      format.html # index.html.erb
+      format.xml  { render :xml => @blogs }
+    end
+  end
+
+  # GET /blogs/1
+  # GET /blogs/1.xml
+  def show
+    @blog = Blog.find(params[:id])
+
+    respond_to do |format|
+      format.html # show.html.erb
+      format.xml  { render :xml => @blog }
+    end
+  end
+
+  # GET /blogs/new
+  # GET /blogs/new.xml
+  def new
+    @blog = Blog.new
+
+    respond_to do |format|
+      format.html # new.html.erb
+      format.xml  { render :xml => @blog }
+    end
+  end
+
+  # GET /blogs/1/edit
+  def edit
+    @blog = Blog.find(params[:id])
+  end
+
+  # POST /blogs
+  # POST /blogs.xml
+  def create
+    @blog = Blog.new(params[:blog])
+
+    respond_to do |format|
+      if @blog.save
+        format.html { redirect_to(@blog, :notice => 'Blog was successfully created.') }
+        format.xml  { render :xml => @blog, :status => :created, :location => @blog }
+      else
+        format.html { render :action => "new" }
+        format.xml  { render :xml => @blog.errors, :status => :unprocessable_entity }
+      end
+    end
+  end
+
+  # PUT /blogs/1
+  # PUT /blogs/1.xml
+  def update
+    @blog = Blog.find(params[:id])
+
+    respond_to do |format|
+      if @blog.update_attributes(params[:blog])
+        format.html { redirect_to(@blog, :notice => 'Blog was successfully updated.') }
+        format.xml  { head :ok }
+      else
+        format.html { render :action => "edit" }
+        format.xml  { render :xml => @blog.errors, :status => :unprocessable_entity }
+      end
+    end
+  end
+
+  # DELETE /blogs/1
+  # DELETE /blogs/1.xml
+  def destroy
+    @blog = Blog.find(params[:id])
+    @blog.destroy
+
+    respond_to do |format|
+      format.html { redirect_to(blogs_url) }
+      format.xml  { head :ok }
+    end
+  end
+end

data/app/helpers/blogs_helper.rb

@@ -0,0 +1,2 @@
+module BlogsHelper
+end

data/app/models/blog.rb

@@ -0,0 +1,3 @@
+class Blog < ActiveRecord::Base
+  belongs_to :user
+end

data/app/models/user.rb

@@ -1,2 +1,3 @@
 class User < ActiveRecord::Base
+  has_many :blogs
 end

data/app/views/blogs/_form.html.erb

@@ -0,0 +1,25 @@
+<%= form_for(@blog) do |f| %>
+  <% if @blog.errors.any? %>
+    <div id="error_explanation">
+      <h2><%= pluralize(@blog.errors.count, "error") %> prohibited this blog from being saved:</h2>
+
+      <ul>
+      <% @blog.errors.full_messages.each do |msg| %>
+        <li><%= msg %></li>
+      <% end %>
+      </ul>
+    </div>
+  <% end %>
+
+  <div class="field">
+    <%= f.label :title %><br />
+    <%= f.text_field :title %>
+  </div>
+  <div class="field">
+    <%= f.label :content %><br />
+    <%= f.text_area :content %>
+  </div>
+  <div class="actions">
+    <%= f.submit %>
+  </div>
+<% end %>

data/app/views/blogs/edit.html.erb

@@ -0,0 +1,6 @@
+<h1>Editing blog</h1>
+
+<%= render 'form' %>
+
+<%= link_to 'Show', @blog %> |
+<%= link_to 'Back', blogs_path %>

data/app/views/blogs/index.html.erb

@@ -0,0 +1,25 @@
+<h1>Listing blogs</h1>
+
+<table>
+  <tr>
+    <th>Title</th>
+    <th>Content</th>
+    <th></th>
+    <th></th>
+    <th></th>
+  </tr>
+
+<% @blogs.each do |blog| %>
+  <tr>
+    <td><%= blog.title %></td>
+    <td><%= blog.content %></td>
+    <td><%= link_to 'Show', blog %></td>
+    <td><%= link_to 'Edit', edit_blog_path(blog) %></td>
+    <td><%= link_to 'Destroy', blog, :confirm => 'Are you sure?', :method => :delete %></td>
+  </tr>
+<% end %>
+</table>
+
+<br />
+
+<%= link_to 'New Blog', new_blog_path %>

data/app/views/blogs/new.html.erb

@@ -0,0 +1,5 @@
+<h1>New blog</h1>
+
+<%= render 'form' %>
+
+<%= link_to 'Back', blogs_path %>

data/app/views/blogs/show.html.erb

@@ -0,0 +1,15 @@
+<p id="notice"><%= notice %></p>
+
+<p>
+  <b>Title:</b>
+  <%= @blog.title %>
+</p>
+
+<p>
+  <b>Content:</b>
+  <%= @blog.content %>
+</p>
+
+
+<%= link_to 'Edit', edit_blog_path(@blog) %> |
+<%= link_to 'Back', blogs_path %>

data/config/routes.rb

@@ -1,4 +1,6 @@
 InductionCannon01::Application.routes.draw do
+  resources :blogs
+
   resources :users
 
   # The priority is based upon order of creation:

data/db/migrate/20110302022059_create_blogs.rb

@@ -0,0 +1,14 @@
+class CreateBlogs < ActiveRecord::Migration
+  def self.up
+    create_table :blogs do |t|
+      t.string :title
+      t.text :content
+
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :blogs
+  end
+end

data/db/migrate/20110302024844_add_user_id_to_blogs.rb

@@ -0,0 +1,9 @@
+class AddUserIdToBlogs < ActiveRecord::Migration
+  def self.up
+    add_column :blogs, :user_id, :integer
+  end
+
+  def self.down
+    remove_column :blogs, :user_id
+  end
+end

data/db/schema.rb

@@ -10,7 +10,15 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20110301055018) do
+ActiveRecord::Schema.define(:version => 20110302024844) do
+
+  create_table "blogs", :force => true do |t|
+    t.string   "title"
+    t.text     "content"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "user_id"
+  end
 
   create_table "users", :force => true do |t|
     t.string   "name"

data/induction_cannon_01.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{induction_cannon_01}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["zhanyinan"]
@@ -28,10 +28,18 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "app/controllers/application_controller.rb",
+    "app/controllers/blogs_controller.rb",
     "app/controllers/users_controller.rb",
     "app/helpers/application_helper.rb",
+    "app/helpers/blogs_helper.rb",
     "app/helpers/users_helper.rb",
+    "app/models/blog.rb",
     "app/models/user.rb",
+    "app/views/blogs/_form.html.erb",
+    "app/views/blogs/edit.html.erb",
+    "app/views/blogs/index.html.erb",
+    "app/views/blogs/new.html.erb",
+    "app/views/blogs/show.html.erb",
     "app/views/layouts/application.html.erb",
     "app/views/users/_form.html.erb",
     "app/views/users/edit.html.erb",
@@ -54,12 +62,15 @@ Gem::Specification.new do |s|
     "config/locales/en.yml",
     "config/routes.rb",
     "db/migrate/20110301055018_create_users.rb",
+    "db/migrate/20110302022059_create_blogs.rb",
+    "db/migrate/20110302024844_add_user_id_to_blogs.rb",
     "db/schema.rb",
     "db/seeds.rb",
     "doc/README_FOR_APP",
     "induction_cannon_01.gemspec",
     "lib/induction_cannon_01.rb",
     "lib/tasks/.gitkeep",
+    "pkg/induction_cannon_01-0.0.1.gem",
     "public/404.html",
     "public/422.html",
     "public/500.html",
@@ -76,6 +87,7 @@ Gem::Specification.new do |s|
     "public/stylesheets/.gitkeep",
     "public/stylesheets/scaffold.css",
     "script/rails",
+    "spec/models/extra_spec.rb",
     "spec/models/user_spec.rb",
     "spec/spec_helper.rb",
     "vendor/plugins/.gitkeep"
@@ -86,6 +98,7 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.5.2}
   s.summary = %q{personal suit, base on dragoon_system}
   s.test_files = [
+    "spec/models/extra_spec.rb",
     "spec/models/user_spec.rb",
     "spec/spec_helper.rb"
   ]
@@ -96,7 +109,7 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rails>, ["= 3.0.5"])
       s.add_runtime_dependency(%q<mysql2>, [">= 0"])
-      s.add_runtime_dependency(%q<dragoon_system>, [">= 0"])
+      s.add_runtime_dependency(%q<dragoon_system>, ["= 0.1.3"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.10"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.1"])
       s.add_development_dependency(%q<rspec-rails>, ["~> 2.5.0"])
@@ -104,7 +117,7 @@ Gem::Specification.new do |s|
     else
       s.add_dependency(%q<rails>, ["= 3.0.5"])
       s.add_dependency(%q<mysql2>, [">= 0"])
-      s.add_dependency(%q<dragoon_system>, [">= 0"])
+      s.add_dependency(%q<dragoon_system>, ["= 0.1.3"])
       s.add_dependency(%q<bundler>, ["~> 1.0.10"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
       s.add_dependency(%q<rspec-rails>, ["~> 2.5.0"])
@@ -113,7 +126,7 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<rails>, ["= 3.0.5"])
     s.add_dependency(%q<mysql2>, [">= 0"])
-    s.add_dependency(%q<dragoon_system>, [">= 0"])
+    s.add_dependency(%q<dragoon_system>, ["= 0.1.3"])
     s.add_dependency(%q<bundler>, ["~> 1.0.10"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
     s.add_dependency(%q<rspec-rails>, ["~> 2.5.0"])

data/spec/models/extra_spec.rb

@@ -0,0 +1,10 @@
+require 'spec_helper'
+
+describe User do
+  it 'helper' do
+    user = User.new
+    helpers = user.send(:helpers)
+    helpers.send(:link_to, "cool", "/").should == "<a href=\"/\">cool</a>"
+
+  end
+end

data/spec/models/user_spec.rb

@@ -1,14 +1,72 @@
 require 'spec_helper'
 
 describe User do
-  it 'regexp' do
-    user1 = User.create(:info => "cool")
-    user2 = User.create(:info => "hello")
+  describe 'regexp' do
+    it '01' do
+      user1 = User.create(:info => "cool")
+      user2 = User.create(:info => "hello")
 
-    result = User.regexp(:info, "ll")
+      result = User.regexp(:info, "ll")
 
-    result.should have(1).user
-    result.first.should == user2
+      result.should have(1).user
+      result.first.should == user2
     
+    end
+  
+    it '02' do
+      User.create(:info => "cool")
+      User.create(:info => "hello")
+
+      result = User.regexp(:info, "olo")
+
+      result.should have(0).user
+    end
   end
+
+  describe 'fuzzy search' do
+    it '01' do
+      user1 = User.create(:info => "cool")
+      user2 = User.create(:info => "hello")
+
+      result = User.fuzzy(User => {:info => "ll"})
+      result.should have(1).user
+      result.first.should == user2
+
+    end
+    
+    it '02' do
+      User.create(:info => "cool")
+      User.create(:info => "hello")
+
+      result = User.fuzzy(User => {:info => "olo"})
+      result.should have(0).user
+
+    end
+
+    it '03' do
+      User.create(:info => "cool")
+      User.create(:info => "hello")
+
+      result = User.fuzzy(User => {:info => "l"})
+
+      User.all.should have(2).user
+      result.should have(2).user
+    end
+    
+    it '04' do
+      user = User.create(:info => "cool")
+      User.create(:info => "hello")
+      user.blogs.create(:title => "yeah")
+
+      result = User.includes(:blogs).fuzzy(User => {:info => "lll"}, Blog => {:title => "y"})
+
+      result.should have(1).user
+    end
+
+
+
+
+  end
+
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: induction_cannon_01
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - zhanyinan
@@ -53,12 +53,14 @@ dependencies:
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 29
         segments: 
         - 0
-        version: "0"
+        - 1
+        - 3
+        version: 0.1.3
   prerelease: false
   type: :runtime
   requirement: *id003
@@ -145,10 +147,18 @@ files:
 - Rakefile
 - VERSION
 - app/controllers/application_controller.rb
+- app/controllers/blogs_controller.rb
 - app/controllers/users_controller.rb
 - app/helpers/application_helper.rb
+- app/helpers/blogs_helper.rb
 - app/helpers/users_helper.rb
+- app/models/blog.rb
 - app/models/user.rb
+- app/views/blogs/_form.html.erb
+- app/views/blogs/edit.html.erb
+- app/views/blogs/index.html.erb
+- app/views/blogs/new.html.erb
+- app/views/blogs/show.html.erb
 - app/views/layouts/application.html.erb
 - app/views/users/_form.html.erb
 - app/views/users/edit.html.erb
@@ -171,12 +181,15 @@ files:
 - config/locales/en.yml
 - config/routes.rb
 - db/migrate/20110301055018_create_users.rb
+- db/migrate/20110302022059_create_blogs.rb
+- db/migrate/20110302024844_add_user_id_to_blogs.rb
 - db/schema.rb
 - db/seeds.rb
 - doc/README_FOR_APP
 - induction_cannon_01.gemspec
 - lib/induction_cannon_01.rb
 - lib/tasks/.gitkeep
+- pkg/induction_cannon_01-0.0.1.gem
 - public/404.html
 - public/422.html
 - public/500.html
@@ -193,6 +206,7 @@ files:
 - public/stylesheets/.gitkeep
 - public/stylesheets/scaffold.css
 - script/rails
+- spec/models/extra_spec.rb
 - spec/models/user_spec.rb
 - spec/spec_helper.rb
 - vendor/plugins/.gitkeep
@@ -231,5 +245,6 @@ signing_key:
 specification_version: 3
 summary: personal suit, base on dragoon_system
 test_files: 
+- spec/models/extra_spec.rb
 - spec/models/user_spec.rb
 - spec/spec_helper.rb