crudify 0.0.5 → 0.0.6

data/.gitignore

@@ -1,6 +1,7 @@
 .bundle
 .DS_Store
 *.gem
+Gemfile.lock
 pkg/*
 test/dummy/log
 test/dummy/tmp

data/Gemfile

@@ -1,4 +1,2 @@
 source "http://rubygems.org"
-
-# Specify your gem's dependencies in crudify.gemspec
 gemspec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    crudify (0.0.5)
+    crudify (0.0.6)
       meta_search (>= 1.0.1)
       rails (>= 3.0.0)
       will_paginate (>= 2.3.15)
@@ -10,32 +10,32 @@ GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
-    actionmailer (3.0.5)
-      actionpack (= 3.0.5)
+    actionmailer (3.0.7)
+      actionpack (= 3.0.7)
       mail (~> 2.2.15)
-    actionpack (3.0.5)
-      activemodel (= 3.0.5)
-      activesupport (= 3.0.5)
+    actionpack (3.0.7)
+      activemodel (= 3.0.7)
+      activesupport (= 3.0.7)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
-      i18n (~> 0.4)
+      i18n (~> 0.5.0)
       rack (~> 1.2.1)
-      rack-mount (~> 0.6.13)
+      rack-mount (~> 0.6.14)
       rack-test (~> 0.5.7)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.5)
-      activesupport (= 3.0.5)
+    activemodel (3.0.7)
+      activesupport (= 3.0.7)
       builder (~> 2.1.2)
-      i18n (~> 0.4)
-    activerecord (3.0.5)
-      activemodel (= 3.0.5)
-      activesupport (= 3.0.5)
+      i18n (~> 0.5.0)
+    activerecord (3.0.7)
+      activemodel (= 3.0.7)
+      activesupport (= 3.0.7)
       arel (~> 2.0.2)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.5)
-      activemodel (= 3.0.5)
-      activesupport (= 3.0.5)
-    activesupport (3.0.5)
+    activeresource (3.0.7)
+      activemodel (= 3.0.7)
+      activesupport (= 3.0.7)
+    activesupport (3.0.7)
     arel (2.0.9)
     builder (2.1.2)
     capybara (0.4.1.2)
@@ -47,22 +47,21 @@ GEM
       rack-test (>= 0.5.4)
       selenium-webdriver (>= 0.0.27)
       xpath (~> 0.1.3)
-    celerity (0.8.8)
-    childprocess (0.1.7)
-      ffi (~> 0.6.3)
+    celerity (0.8.9)
+    childprocess (0.1.9)
+      ffi (~> 1.0.6)
     culerity (0.2.15)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    ffi (0.6.3)
-      rake (>= 0.8.7)
+    ffi (1.0.8)
     i18n (0.5.0)
     json_pure (1.5.1)
-    mail (2.2.15)
+    mail (2.2.19)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    meta_search (1.0.1)
+    meta_search (1.0.5)
       actionpack (~> 3.0.2)
       activerecord (~> 3.0.2)
       activesupport (~> 3.0.2)
@@ -70,29 +69,29 @@ GEM
     mime-types (1.16)
     nokogiri (1.4.4)
     polyglot (0.3.1)
-    rack (1.2.1)
-    rack-mount (0.6.13)
+    rack (1.2.2)
+    rack-mount (0.6.14)
       rack (>= 1.0.0)
     rack-test (0.5.7)
       rack (>= 1.0)
-    rails (3.0.5)
-      actionmailer (= 3.0.5)
-      actionpack (= 3.0.5)
-      activerecord (= 3.0.5)
-      activeresource (= 3.0.5)
-      activesupport (= 3.0.5)
+    rails (3.0.7)
+      actionmailer (= 3.0.7)
+      actionpack (= 3.0.7)
+      activerecord (= 3.0.7)
+      activeresource (= 3.0.7)
+      activesupport (= 3.0.7)
       bundler (~> 1.0)
-      railties (= 3.0.5)
-    railties (3.0.5)
-      actionpack (= 3.0.5)
-      activesupport (= 3.0.5)
+      railties (= 3.0.7)
+    railties (3.0.7)
+      actionpack (= 3.0.7)
+      activesupport (= 3.0.7)
       rake (>= 0.8.7)
       thor (~> 0.14.4)
     rake (0.8.7)
     rubyzip (0.9.4)
-    selenium-webdriver (0.1.3)
-      childprocess (~> 0.1.5)
-      ffi (~> 0.6.3)
+    selenium-webdriver (0.2.0)
+      childprocess (>= 0.1.7)
+      ffi (>= 1.0.7)
       json_pure
       rubyzip
     shoulda (2.11.3)
@@ -102,9 +101,9 @@ GEM
     thor (0.14.6)
     treetop (1.4.9)
       polyglot (>= 0.3.1)
-    tzinfo (0.3.25)
+    tzinfo (0.3.27)
     will_paginate (2.3.15)
-    xpath (0.1.3)
+    xpath (0.1.4)
       nokogiri (~> 1.3)
 
 PLATFORMS

data/README.md

@@ -45,7 +45,7 @@ Here's what lines #45-59 in `lib/crudify/class_methods.rb` will produce in our J
           :position => ((Jelly.maximum(:position, :conditions => "")||-1) + 1)
         })
       end
-      @instance = @jelly = Jelly.create(params[:jelly])
+      @instance = @jelly = Jelly.new(params[:jelly])
       before_create
       if @instance.valid? && @instance.save
         successful_create
@@ -102,9 +102,9 @@ Or an after-action hook:
 
 ### To find out more about crudify, read the source! Here's some helpful links:
 
-* For available options: [Crudify::Base](https://github.com/citrus/crudify/blob/master/lib/crudify/base.rb)
-* For available hooks: [Crudify::HookMethods](https://github.com/citrus/crudify/blob/master/lib/crudify/hook_methods.rb)
-* To see which hooks go where: [Cruidfy::ClassMethods](https://github.com/citrus/crudify/blob/master/lib/crudify/class_methods.rb)
+* For available **options**: [Crudify::Base](https://github.com/citrus/crudify/blob/master/lib/crudify/base.rb)
+* For available **hooks**: [Crudify::HookMethods](https://github.com/citrus/crudify/blob/master/lib/crudify/hook_methods.rb)
+* To see **which hooks go where**: [Cruidfy::ClassMethods](https://github.com/citrus/crudify/blob/master/lib/crudify/class_methods.rb)
 
 Or check out the demo app in `test/dummy`...
 
@@ -123,7 +123,10 @@ Shoulda and Capybara/Selenium tests can be run by cloning the repo and running `
 To Do
 -----
 
-* Documentation & Examples
+There's a few things to be done still...
+
+* Tests for search
+* More Documentation & Examples
 * Nested set tests and demo (haven't even tried this yet :/)
 * Generally more thorough tests
 * Refactoring/Optimizing
@@ -132,7 +135,7 @@ To Do
 License
 -------
 
-Crudify is released under [Resolve Digital](http://www.resolvedigital.com)'s original license since portions of the code was extracted from [refinerycms](http://github.com/resolve/refinerycms).
+Although many things have been rewritten, crudify is released under [Resolve Digital's](http://www.resolvedigital.com) original license since portions code were extracted from their [refinerycms](http://github.com/resolve/refinerycms) project.
 
 ### MIT License
  

data/crudify.gemspec

@@ -3,6 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 require "crudify/version"
 
 Gem::Specification.new do |s|
+
   s.name        = "crudify"
   s.version     = Crudify::VERSION
   s.platform    = Gem::Platform::RUBY

data/lib/crudify/class_methods.rb

@@ -5,11 +5,13 @@
 # the splendid fellows at Resolve Digital for their
 # awesome refinerycms project.
 #
+
 module Crudify  
 
   module ClassMethods
     
      def crudify(model_name, options = {})
+       
        options = ::Crudify::Base.default_options(model_name).merge(options)
        
        singular_name = model_name.to_s
@@ -28,7 +30,7 @@ module Crudify
          prepend_before_filter :set_crud_options                        
                                
          def set_crud_options
-           @crud_options = #{options}
+           @crud_options = #{options.inspect}
          end
                   
          def set_what
@@ -56,8 +58,9 @@ module Crudify
                :position => ((#{class_name}.maximum(:position, :conditions => #{options[:conditions].inspect})||-1) + 1)
              })
            end
-           @instance = @#{singular_name} = #{class_name}.create(params[:#{singular_name}])
-           before_create
+           @instance = @#{singular_name} = #{class_name}.new(params[:#{singular_name}])
+           ok = before_create
+           return ok unless ok === true
            if @instance.valid? && @instance.save  
              successful_create
            else
@@ -70,7 +73,8 @@ module Crudify
          end
   
          def update
-           before_update
+           ok = before_update
+           return ok unless ok === true           
            if @#{singular_name}.update_attributes(params[:#{singular_name}])
              successful_update              
            else
@@ -79,8 +83,9 @@ module Crudify
          end
   
          def destroy
-           before_destroy
            set_what
+           ok = before_destroy
+           return ok unless ok === true
            # object gets found by find_#{singular_name} function
            if @#{singular_name}.destroy
              successful_destroy
@@ -103,9 +108,8 @@ module Crudify
          def scope_with_options(scope)
            scope.includes(
              #{options[:include].map(&:to_sym).inspect}
-           ).order("#{options[:order]}")
+           )
          end
-         
   
          # Finds one single result based on the id params.
          def find_#{singular_name}
@@ -131,7 +135,7 @@ module Crudify
   
            # Seems will_paginate doesn't always use the implicit method.
            if #{class_name}.methods.map(&:to_sym).include?(:per_page)
-             paginate_options.update({:per_page => #{class_name}.per_page})
+             paginate_options.update(:per_page => #{class_name}.per_page)
            end
   
            set_collection(@#{plural_name}.paginate(paginate_options), false)
@@ -139,6 +143,8 @@ module Crudify
   
          # Returns results based on the query specified by the user.
          def search_all_#{plural_name}
+           params[:search] ||= {}
+           params[:search][:meta_sort] ||= #{options[:order].to_s.downcase.gsub(' ', '.').inspect}
            @search ||= find_all_#{plural_name}.search(params[:search])
            set_collection(@search, false)
          end

data/lib/crudify/hook_methods.rb

@@ -25,7 +25,7 @@ module Crudify
       def before_action
         # just a hook!
         puts "> Crud::before_action" if @crud_options[:log]
-        #true
+        true
       end
       
               
@@ -61,10 +61,12 @@ module Crudify
             redirect_to @redirect_to_url
           elsif params[:commit].to_s.match(/continue/)
             if params[:action] == 'create'
-              redirect_to request.referer.sub(/(\/?(new)?\/?)$/, '') + "/#{@instance.to_param}"
+              url =  request.referer.sub(/(\/?(new)?\/?)$/, '') + "/#{@instance.to_param}"
+              url += "/edit" if params[:commit].to_s.match(/edit/)
             else
-              redirect_to request.referer
-            end            
+              url = request.referer
+            end    
+            redirect_to url        
           else
             url = eval(@crud_options[:redirect_to_url])
             if defined?(redirect_back_or_default)

data/lib/crudify/version.rb

@@ -1,3 +1,3 @@
 module Crudify
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/test/functional/controller_hooks_test.rb

@@ -0,0 +1,150 @@
+require 'helper'
+
+module HookAssertions
+
+  # We'll store things we want to assert here for now, 
+  # then run the assertions at teardown
+  #
+  #   assertions << [ :assert, true, "True is true!" ]
+  #   assertions << [ :assert_not_nil, 1, "1 is not nil" ]
+  #
+  def assertions
+    @assertions ||= []
+  end
+  
+  
+  private
+  
+  def before_create
+    assertions << [ :assert_not_nil, @jelly, "Jelly should be assigned" ]
+    assertions << [ :assert, @jelly.new_record?, "Jelly should be a new record" ]
+    super
+  end
+  
+  def before_update
+    assertions << [ :assert_not_nil, @jelly, "Jelly should be assigned" ]
+    assertions << [ :assert, !@jelly.new_record?, "Jelly should not be a new record" ]
+    super
+  end
+  
+  ## not sure what to check for here...
+  #def before_action
+  #  assertions << [ :assert, true ]
+  #  super
+  #end
+  
+  def successful_create
+    assertions << [ :assert, !@jelly.new_record?, "Jelly should not be a new record" ]
+    super
+  end
+  
+  def successful_update
+    assertions << [ :assert_equal, @jelly.name, "Controlafresh" ]
+    assertions << [ :assert, !@jelly.changed?, "Should be clean" ]
+    super
+  end
+  
+  def successful_destroy
+    @old_jelly = Jelly.find(@jelly.id) rescue nil
+    assertions << [ :assert, @old_jelly.nil? ]
+    super
+  end
+  
+  def after_success
+    assertions << [ :assert_not_nil, flash[:notice], "Should have a notice" ]
+    assertions << [ :assert, flash[:error].nil?, "Should not have an error message" ]
+    super
+  end
+  
+  def failed_create 
+    assertions << [ :assert, !@jelly.errors.empty?, "Jelly has errors" ]
+    super
+  end
+  
+  def failed_update
+    assertions << [ :assert, @jelly.changed?, "Jelly has unsaved updates" ]
+    super
+  end
+  
+  def failed_destroy
+    @old_jelly = Jelly.find(@jelly.id) rescue nil
+    assertions << [ :assert_not_nil, @old_jelly ]
+    super
+  end
+  
+  def after_fail
+    assertions << [ :assert_not_nil, flash[:error].nil?, "Should have an error message" ]
+    assertions << [ :assert, flash[:notice].nil?, "Should not have a notice" ]
+    super
+  end
+  
+end    
+
+
+class ControllerHooksTest < ActionController::TestCase
+  
+  def setup
+    # assertions will be created in the included module  
+    JelliesController.send(:include, HookAssertions)
+    @controller = JelliesController.new
+  end
+  
+  def teardown
+    # fire any assertions we saved in the controller
+    @controller.assertions.each do |args|
+      send(*args)
+    end
+  end
+  
+  should "post to create" do
+    post :create, :jelly => { :title => "Controller Jelly", :name => "Controlaberry" }
+  end
+  
+  should "post to create and fail" do
+    post :create, :jelly => { :title => "", :name => "" }
+  end
+    
+  context "with a jelly" do
+    
+    setup do
+      @jelly = Jelly.create(:title => "Controller Jelly", :name => "Controlaberry")
+    end
+    
+    should "put update" do
+      put :update, :id => @jelly.id, :jelly => { :title => "Updated Controller Jelly", :name => "Controlafresh" }
+    end 
+  
+    should "put update and fail" do
+      put :update, :id => @jelly.id, :jelly => { :title => "", :name => "" }
+    end 
+  
+    should "delete, destroy and maybe conquer" do
+      delete :destroy, :id => @jelly.id
+    end
+    
+    should "delete but not destroy" do
+      # overwrite the default destroy method..
+      # is there a better way to do this?
+      Jelly.class_eval do
+        
+        alias :aliased_destroy :destroy
+        
+        def destroy
+          false
+        end
+      end
+
+      delete :destroy, :id => @jelly.id
+      
+      # rewrite to the old method
+      Jelly.class_eval do
+        def destroy
+          aliased_destroy
+        end
+      end      
+
+    end
+    
+  end
+  
+end

metadata

@@ -1,8 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: crudify
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.0.5
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Spencer Steffen
@@ -10,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-16 00:00:00 -07:00
+date: 2011-05-14 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,6 +25,10 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 0
+        - 0
         version: 3.0.0
   type: :runtime
   version_requirements: *id001
@@ -32,6 +40,10 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 3
+        - 15
         version: 2.3.15
   type: :runtime
   version_requirements: *id002
@@ -43,6 +55,10 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        - 1
         version: 1.0.1
   type: :runtime
   version_requirements: *id003
@@ -54,6 +70,10 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 11
+        - 3
         version: 2.11.3
   type: :development
   version_requirements: *id004
@@ -65,6 +85,10 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 3
+        - 3
         version: 1.3.3
   type: :development
   version_requirements: *id005
@@ -76,6 +100,10 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 4
+        - 1
         version: 0.4.1
   type: :development
   version_requirements: *id006
@@ -87,6 +115,10 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 1
+        - 3
         version: 0.1.3
   type: :development
   version_requirements: *id007
@@ -163,6 +195,7 @@ files:
 - test/dummy/public/javascripts/rails.js
 - test/dummy/public/stylesheets/styles.css
 - test/dummy/script/rails
+- test/functional/controller_hooks_test.rb
 - test/functional/jellies_controller_test.rb
 - test/helper.rb
 - test/integration/demo_test.rb
@@ -181,17 +214,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Crudify is a dynamic resource controller for Rails 3.
@@ -246,6 +283,7 @@ test_files:
 - test/dummy/public/javascripts/rails.js
 - test/dummy/public/stylesheets/styles.css
 - test/dummy/script/rails
+- test/functional/controller_hooks_test.rb
 - test/functional/jellies_controller_test.rb
 - test/helper.rb
 - test/integration/demo_test.rb