makandra_resource_controller 0.7.3 → 0.8.0

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
-:minor: 7
-:patch: 3
 :major: 0
 :build: 
+:minor: 8
+:patch: 0

data/lib/resource_controller/accessors.rb

@@ -30,12 +30,14 @@ module ResourceController # :nodoc:
       end
       
       def class_scoping_reader(accessor_name, start_value)
-        write_inheritable_attribute accessor_name, start_value
+        private_accessor_name = "_#{accessor_name}"
+        class_attribute private_accessor_name
+        self.__send__("#{private_accessor_name}=", start_value)
         
         class_eval <<-"end_eval", __FILE__, __LINE__
           def self.#{accessor_name}(&block)
-            read_inheritable_attribute(:#{accessor_name}).instance_eval(&block) if block_given?
-            read_inheritable_attribute(:#{accessor_name})
+            self.#{private_accessor_name}.instance_eval(&block) if block_given?
+            self.#{private_accessor_name}
           end
         end_eval
       end
@@ -53,22 +55,24 @@ module ResourceController # :nodoc:
       def class_reader_writer(*accessor_names)
         accessor_names.each do |accessor_name|
           class_eval <<-"end_eval", __FILE__, __LINE__
+            class_attribute :_#{accessor_name}
+
             def self.#{accessor_name}(*args)
               unless args.empty?
-                write_inheritable_attribute :#{accessor_name}, args.first if args.length == 1
-                write_inheritable_attribute :#{accessor_name}, args if args.length > 1
+                self._#{accessor_name} = args.first if args.length == 1
+                self._#{accessor_name} = args if args.length > 1
               end
             
-              read_inheritable_attribute :#{accessor_name}
+              self._#{accessor_name}
             end
           
             def #{accessor_name}(*args)
               unless args.empty?
-                self.class.write_inheritable_attribute :#{accessor_name}, args.first if args.length == 1
-                self.class.write_inheritable_attribute :#{accessor_name}, args if args.length > 1
+                self.class._#{accessor_name} = args.first if args.length == 1
+                self.class._#{accessor_name} = args if args.length > 1
               end
             
-              self.class.read_inheritable_attribute :#{accessor_name}
+              self.class._#{accessor_name}
             end
           end_eval
         end

data/test/Gemfile

@@ -1,13 +1,13 @@
 source 'http://rubygems.org'
 
-gem 'rails', '=3.0.1'
-gem 'sqlite3-ruby', '=1.3.2', :require => 'sqlite3'
+gem 'rails', '=3.2.3'
+gem 'sqlite3', '=1.3.6'
 gem "makandra_resource_controller", :path => "../"
 
 gem 'redgreen', '=1.2.2'
 
 group :test do
-  gem "shoulda", '=2.11.3'
+  gem "shoulda", '=3.0.1'
   gem "mocha", '=0.9.9'
   gem "ruby-debug", '=0.10.4'
 end

data/test/Gemfile.lock

@@ -0,0 +1,114 @@
+PATH
+  remote: ../
+  specs:
+    makandra_resource_controller (0.8.0)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (3.2.3)
+      actionpack (= 3.2.3)
+      mail (~> 2.4.4)
+    actionpack (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.1)
+      rack (~> 1.4.0)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.1.2)
+    activemodel (3.2.3)
+      activesupport (= 3.2.3)
+      builder (~> 3.0.0)
+    activerecord (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activeresource (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
+    activesupport (3.2.3)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    arel (3.0.2)
+    builder (3.0.0)
+    columnize (0.3.6)
+    erubis (2.7.0)
+    hike (1.2.1)
+    i18n (0.6.0)
+    journey (1.0.3)
+    json (1.7.3)
+    linecache (0.46)
+      rbx-require-relative (> 0.0.4)
+    mail (2.4.4)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.18)
+    mocha (0.9.9)
+      rake
+    multi_json (1.3.6)
+    polyglot (0.3.3)
+    rack (1.4.1)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.1)
+      rack (>= 1.0)
+    rails (3.2.3)
+      actionmailer (= 3.2.3)
+      actionpack (= 3.2.3)
+      activerecord (= 3.2.3)
+      activeresource (= 3.2.3)
+      activesupport (= 3.2.3)
+      bundler (~> 1.0)
+      railties (= 3.2.3)
+    railties (3.2.3)
+      actionpack (= 3.2.3)
+      activesupport (= 3.2.3)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (~> 0.14.6)
+    rake (0.9.2.2)
+    rbx-require-relative (0.0.9)
+    rdoc (3.12)
+      json (~> 1.4)
+    redgreen (1.2.2)
+    ruby-debug (0.10.4)
+      columnize (>= 0.1)
+      ruby-debug-base (~> 0.10.4.0)
+    ruby-debug-base (0.10.4)
+      linecache (>= 0.3)
+    shoulda (3.0.1)
+      shoulda-context (~> 1.0.0)
+      shoulda-matchers (~> 1.0.0)
+    shoulda-context (1.0.0)
+    shoulda-matchers (1.0.0)
+    sprockets (2.1.3)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sqlite3 (1.3.6)
+    thor (0.14.6)
+    tilt (1.3.3)
+    treetop (1.4.10)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.33)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  makandra_resource_controller!
+  mocha (= 0.9.9)
+  rails (= 3.2.3)
+  redgreen (= 1.2.2)
+  ruby-debug (= 0.10.4)
+  shoulda (= 3.0.1)
+  sqlite3 (= 1.3.6)

data/test/config/environments/development.rb

@@ -10,10 +10,10 @@ TestApp::Application.configure do
   config.whiny_nils = true
 
   # Show full error reports and disable caching
-  config.action_controller.consider_all_requests_local = true
+#  config.action_controller.consider_all_requests_local = true
   config.action_controller.perform_caching             = false
-  config.action_view.debug_rjs                         = true
+#  config.action_view.debug_rjs                         = true
 
   # Don't care if the mailer can't send
   config.action_mailer.raise_delivery_errors = false
-end
+end

data/test/config/environments/test.rb

@@ -11,7 +11,7 @@ TestApp::Application.configure do
   config.whiny_nils = true
 
   # Show full error reports and disable caching
-  config.consider_all_requests_local       = true
+#  config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
 
   # Raise exceptions instead of rendering exception templates
@@ -31,4 +31,4 @@ TestApp::Application.configure do
   # This is necessary if your schema can't be completely dumped by the schema dumper,
   # like if you have constraints or database-specific column types
   # config.active_record.schema_format = :sql
-end
+end

data/test/test/functional/cms/options_controller_test.rb

@@ -78,7 +78,7 @@ class Cms::OptionsControllerTest < ActionController::TestCase
       get :edit, :product_id => @product.id, :id => @option.id
     end
 
-    should assign_to(:option).with(@option)
+    should assign_to(:option).with { @option }
     should respond_with :success
     should render_with_layout :application
     should render_template :edit
@@ -91,7 +91,7 @@ class Cms::OptionsControllerTest < ActionController::TestCase
         put :update, :product_id => @product.id, :id => @option.id, :option => {:title => 'My new option'}
       end
 
-      should assign_to(:option){ @option }
+      should assign_to(:option).with { @option }
       should redirect_to("option page") { cms_product_option_path(assigns(:option)) }
       should set_the_flash.to "Successfully updated!"
 
@@ -122,7 +122,7 @@ class Cms::OptionsControllerTest < ActionController::TestCase
         delete :destroy, :product_id => @product.id, :id => @option.id
       end
 
-      should assign_to(:option){ @option }
+      should assign_to(:option).with { @option }
       should redirect_to("options index"){ cms_product_options_url }
       should set_the_flash.to "Successfully removed!"
     end

data/test/test/functional/comments_controller_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 class CommentsControllerTest < ActionController::TestCase
   def setup
     @post = posts :one
-    @comment = Comment.find 1
+    @comment = comments :one
   end
 
   context "on GET to :index" do
@@ -78,7 +78,7 @@ class CommentsControllerTest < ActionController::TestCase
       get :edit, :id => @comment.id
     end
 
-    should assign_to(:comment).with(@comment)
+    should assign_to(:comment).with { @comment }
     should respond_with :success
     should render_with_layout :comments
     should render_template :edit
@@ -91,7 +91,7 @@ class CommentsControllerTest < ActionController::TestCase
         put :update, :id => @comment.id, :comment => {:body => 'My new comment'}
       end
 
-      should assign_to(:comment){ @comment }
+      should assign_to(:comment).with { @comment }
       should redirect_to("comment page") { comment_path(assigns(:comment)) }
       should set_the_flash.to "Successfully updated!"
 
@@ -122,7 +122,7 @@ class CommentsControllerTest < ActionController::TestCase
         delete :destroy, :id => @comment.id
       end
 
-      should assign_to(:comment){ @comment }
+      should assign_to(:comment).with { @comment }
       should redirect_to("comments index"){ comments_path }
       should set_the_flash.to "Successfully removed!"
     end

data/test/test/functional/images_controller_test.rb

@@ -23,7 +23,7 @@ class ImagesControllerTest < ActionController::TestCase
   end
 
   should "not respond to show" do
-    assert_raise(ActionController::UnknownAction) do
+    assert_raise(::AbstractController::ActionNotFound) do
       get :show
     end
   end

data/test/test/functional/people_controller_test.rb

@@ -84,7 +84,7 @@ class PeopleControllerTest < ActionController::TestCase
       get :edit, :id => @person.id
     end
 
-    should assign_to(:person).with(@person)
+    should assign_to(:person).with { @person }
     should respond_with :success
     should render_with_layout :people
     should render_template :edit
@@ -97,7 +97,7 @@ class PeopleControllerTest < ActionController::TestCase
         put :update, :id => @person.id, :person => {:name => 'Marcel Marceau'}
       end
 
-      should assign_to(:person){ @person }
+      should assign_to(:person).with { @person }
       should redirect_to("person page") { person_path(assigns(:person)) }
       should set_the_flash.to "Successfully updated!"
 
@@ -128,7 +128,7 @@ class PeopleControllerTest < ActionController::TestCase
         delete :destroy, :id => @person.id
       end
 
-      should assign_to(:person){ @person }
+      should assign_to(:person).with { @person }
       should redirect_to("people index"){ people_path }
       should set_the_flash.to "Successfully removed!"
     end

data/test/test/functional/photos_controller_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 class PhotosControllerTest < ActionController::TestCase
   def setup
     @user = users :one
-    @photo = Photo.find 1
+    @photo = photos :one
   end
 
   context "actions specified" do
@@ -94,7 +94,7 @@ class PhotosControllerTest < ActionController::TestCase
       get :edit, :id => @photo.id
     end
 
-    should assign_to(:photo).with(@photo)
+    should assign_to(:photo).with { @photo }
     should respond_with :success
     should render_with_layout :photos
     should render_template :edit
@@ -107,7 +107,7 @@ class PhotosControllerTest < ActionController::TestCase
         delete :destroy, :id => @photo.id
       end
 
-      should assign_to(:photo){ @photo }
+      should assign_to(:photo).with { @photo }
       should redirect_to("photos index"){ photos_path }
       should set_the_flash.to "Successfully removed!"
     end

data/test/test/functional/posts_controller_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 class PostsControllerTest < ActionController::TestCase
   def setup
-    @post = Post.find 1
+    @post = posts :one
   end
 
   context "on post to :create" do

data/test/test/functional/projects_controller_test.rb

@@ -74,7 +74,7 @@ class ProjectsControllerTest < ActionController::TestCase
       get :edit, :id => @project.id
     end
 
-    should assign_to(:project).with(@project)
+    should assign_to(:project).with { @project }
     should respond_with :success
     should render_with_layout :projects
     should render_template :edit
@@ -87,7 +87,7 @@ class ProjectsControllerTest < ActionController::TestCase
         put :update, :id => @project.id, :project => {:title => 'My new project'}
       end
 
-      should assign_to(:project){ @project }
+      should assign_to(:project).with { @project }
       should redirect_to("project page") { project_path(assigns(:project)) }
       should set_the_flash.to "Successfully updated!"
 
@@ -118,7 +118,7 @@ class ProjectsControllerTest < ActionController::TestCase
         delete :destroy, :id => @project.id
       end
 
-      should assign_to(:project){ @project }
+      should assign_to(:project).with { @project }
       should redirect_to("projects index"){ projects_path }
       should set_the_flash.to "Successfully removed!"
     end

data/test/test/functional/tags_controller_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 class TagsControllerTest < ActionController::TestCase
   def setup
-    @tag = Tag.find 1
+    @tag = tags :one
   end
 
   context "with photo as parent" do

data/test/test/functional/users_controller_test.rb

@@ -74,7 +74,7 @@ class UsersControllerTest < ActionController::TestCase
       get :edit, :id => @dude.id
     end
 
-    should assign_to(:dude).with(@dude)
+    should assign_to(:dude).with { @dude }
     should respond_with :success
     should render_with_layout :application
     should render_template :edit
@@ -87,7 +87,7 @@ class UsersControllerTest < ActionController::TestCase
         put :update, :id => @dude.id, :dude => {:name => 'My new user'}
       end
 
-      should assign_to(:dude){ @dude }
+      should assign_to(:dude).with { @dude }
       should redirect_to("dude page") { dude_path(assigns(:dude)) }
       should set_the_flash.to "Successfully updated!"
 
@@ -118,7 +118,7 @@ class UsersControllerTest < ActionController::TestCase
         delete :destroy, :id => @dude.id
       end
 
-      should assign_to(:dude){ @dude }
+      should assign_to(:dude).with { @dude }
       should redirect_to("dudes index"){ dudes_url }
       should set_the_flash.to "Successfully removed!"
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: makandra_resource_controller
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 63
   prerelease: 
   segments: 
   - 0
-  - 7
-  - 3
-  version: 0.7.3
+  - 8
+  - 0
+  version: 0.8.0
 platform: ruby
 authors: 
 - James Golick
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-29 00:00:00 +01:00
+date: 2012-06-13 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -85,6 +85,7 @@ files:
 - lib/urligence.rb
 - rails/init.rb
 - test/Gemfile
+- test/Gemfile.lock
 - test/Rakefile
 - test/app/controllers/accounts_controller.rb
 - test/app/controllers/application_controller.rb
@@ -131,67 +132,67 @@ files:
 - test/app/views/accounts/edit.html.erb
 - test/app/views/accounts/new.html.erb
 - test/app/views/accounts/show.html.erb
-- test/app/views/cms/options/edit.rhtml
-- test/app/views/cms/options/index.rhtml
-- test/app/views/cms/options/new.rhtml
-- test/app/views/cms/options/show.rhtml
-- test/app/views/cms/photos/edit.rhtml
-- test/app/views/cms/photos/index.rhtml
-- test/app/views/cms/photos/new.rhtml
-- test/app/views/cms/photos/show.rhtml
-- test/app/views/cms/products/edit.rhtml
-- test/app/views/cms/products/index.rhtml
-- test/app/views/cms/products/new.rhtml
-- test/app/views/cms/products/show.rhtml
-- test/app/views/comments/edit.rhtml
-- test/app/views/comments/index.rhtml
-- test/app/views/comments/new.rhtml
-- test/app/views/comments/show.rhtml
+- test/app/views/cms/options/edit.html.erb
+- test/app/views/cms/options/index.html.erb
+- test/app/views/cms/options/new.html.erb
+- test/app/views/cms/options/show.html.erb
+- test/app/views/cms/photos/edit.html.erb
+- test/app/views/cms/photos/index.html.erb
+- test/app/views/cms/photos/new.html.erb
+- test/app/views/cms/photos/show.html.erb
+- test/app/views/cms/products/edit.html.erb
+- test/app/views/cms/products/index.html.erb
+- test/app/views/cms/products/new.html.erb
+- test/app/views/cms/products/show.html.erb
+- test/app/views/comments/edit.html.erb
+- test/app/views/comments/index.html.erb
+- test/app/views/comments/new.html.erb
+- test/app/views/comments/show.html.erb
 - test/app/views/images/_form.html.erb
 - test/app/views/images/edit.html.erb
 - test/app/views/images/new.html.erb
-- test/app/views/layouts/application.rhtml
-- test/app/views/layouts/comments.rhtml
-- test/app/views/layouts/options.rhtml
-- test/app/views/layouts/people.rhtml
-- test/app/views/layouts/photos.rhtml
-- test/app/views/layouts/projects.rhtml
-- test/app/views/layouts/somethings.rhtml
-- test/app/views/layouts/tags.rhtml
+- test/app/views/layouts/application.html.erb
+- test/app/views/layouts/comments.html.erb
+- test/app/views/layouts/options.html.erb
+- test/app/views/layouts/people.html.erb
+- test/app/views/layouts/photos.html.erb
+- test/app/views/layouts/projects.html.erb
+- test/app/views/layouts/somethings.html.erb
+- test/app/views/layouts/tags.html.erb
 - test/app/views/options/_form.html.erb
 - test/app/views/options/edit.html.erb
 - test/app/views/options/index.html.erb
 - test/app/views/options/new.html.erb
 - test/app/views/options/show.html.erb
-- test/app/views/people/edit.rhtml
-- test/app/views/people/index.rhtml
-- test/app/views/people/new.rhtml
-- test/app/views/people/show.rhtml
-- test/app/views/photos/edit.rhtml
-- test/app/views/photos/index.rhtml
-- test/app/views/photos/new.rhtml
-- test/app/views/photos/show.rhtml
-- test/app/views/posts/edit.rhtml
-- test/app/views/posts/index.rhtml
-- test/app/views/posts/new.rhtml
-- test/app/views/posts/show.rhtml
-- test/app/views/projects/edit.rhtml
-- test/app/views/projects/index.rhtml
-- test/app/views/projects/new.rhtml
-- test/app/views/projects/show.rhtml
-- test/app/views/somethings/edit.rhtml
-- test/app/views/somethings/index.rhtml
-- test/app/views/somethings/new.rhtml
-- test/app/views/somethings/show.rhtml
-- test/app/views/tags/edit.rhtml
-- test/app/views/tags/index.rhtml
+- test/app/views/people/edit.html.erb
+- test/app/views/people/index.html.erb
+- test/app/views/people/new.html.erb
+- test/app/views/people/show.html.erb
+- test/app/views/photos/edit.html.erb
+- test/app/views/photos/index.html.erb
+- test/app/views/photos/new.html.erb
+- test/app/views/photos/show.html.erb
+- test/app/views/posts/edit.html.erb
+- test/app/views/posts/index.html.erb
+- test/app/views/posts/new.html.erb
+- test/app/views/posts/show.html.erb
+- test/app/views/projects/edit.html.erb
+- test/app/views/projects/index.html.erb
+- test/app/views/projects/new.html.erb
+- test/app/views/projects/show.html.erb
+- test/app/views/somethings/edit.html.erb
+- test/app/views/somethings/index.html.erb
+- test/app/views/somethings/new.html.erb
+- test/app/views/somethings/show.html.erb
+- test/app/views/tags/edit.html.erb
+- test/app/views/tags/index.html.erb
 - test/app/views/tags/index.rjs
-- test/app/views/tags/new.rhtml
-- test/app/views/tags/show.rhtml
-- test/app/views/users/edit.rhtml
-- test/app/views/users/index.rhtml
-- test/app/views/users/new.rhtml
-- test/app/views/users/show.rhtml
+- test/app/views/tags/new.html.erb
+- test/app/views/tags/show.html.erb
+- test/app/views/users/edit.html.erb
+- test/app/views/users/index.html.erb
+- test/app/views/users/new.html.erb
+- test/app/views/users/show.html.erb
 - test/config.ru
 - test/config/application.rb
 - test/config/boot.rb
@@ -314,7 +315,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.9.3
+rubygems_version: 1.3.9.4
 signing_key: 
 specification_version: 3
 summary: Rails RESTful controller abstraction plugin.