decent_exposure 2.0.0 → 2.0.1

data/README.md

@@ -284,7 +284,7 @@ This block is evaluated and the memoized result is returned whenever you call
 
 For the times when custom behavior is needed for resource finding,
 `decent_exposure` provides a base class for extending. For example, if
-scoping a resource from `current_user` is not and option, but you'd like
+scoping a resource from `current_user` is not an option, but you'd like
 to verify a resource's relationship to the `current_user`, you can use a
 custom strategy like the following:
 
@@ -353,4 +353,52 @@ And opt into it like so:
 expose(:article, config: :sluggable)
 ```
 
-[1]: http://blog.voxdolo.me/a-diatribe-on-maintaining-state.html
+## Testing
+
+Controller testing remains trivially easy. The shift is that you now set expectations on methods rather than instance variables. With RSpec, this mostly means avoiding `assign` and `assigns`.
+
+```ruby
+describe CompaniesController do
+  describe "GET index" do
+
+    # this...
+    it "assigns @companies" do
+      company = Company.create
+      get :index
+      assigns(:companies).should eq([company])
+    end
+
+    # becomes this
+    it "exposes companies" do
+      company = Company.create
+      get :index
+      controller.companies.should eq([company])
+    end
+  end
+end
+```
+
+View specs follow a similar pattern:
+
+```ruby
+describe "people/index.html.erb" do
+
+  # this...
+  it "lists people" do
+    assign(:people, [ mock_model(Person, name: 'John Doe') ])
+    render
+    rendered.should have_content('John Doe')
+  end
+
+  # becomes this
+  it "lists people" do
+    view.stub(people: [ mock_model(Person, name: 'John Doe') ])
+    render
+    rendered.should have_content('John Doe')
+  end
+
+end
+```
+
+
+[1]: http://blog.voxdolo.me/a-diatribe-on-maintaining-state.html

data/lib/decent_exposure/active_record_with_eager_attributes_strategy.rb

@@ -2,19 +2,20 @@ require 'decent_exposure/active_record_strategy'
 
 module DecentExposure
   class ActiveRecordWithEagerAttributesStrategy < ActiveRecordStrategy
-    delegate :get?, :to => :request
+    delegate :get?,    :to => :request
+    delegate :delete?, :to => :request
 
     def singular?
       !plural?
     end
 
     def attributes
-      params[inflector.singular]
+      params[inflector.singular] || {}
     end
 
     def assign_attributes?
       return false unless attributes && singular?
-      !get? || new_record?
+      (!get? && !delete?) || new_record?
     end
 
     def new_record?

data/lib/decent_exposure/exposure.rb

@@ -7,7 +7,7 @@ module DecentExposure
     def initialize(name, strategy, options)
       self.strategy = strategy
       self.options = options
-      self.inflector = DecentExposure::Inflector.new(name)
+      self.inflector = DecentExposure::Inflector.new(name, options[:model])
     end
 
     def call(controller)

data/lib/decent_exposure/inflector.rb

@@ -1,22 +1,23 @@
 require 'active_support/inflector'
-require 'active_support/core_ext/string/inflections'
+require 'active_support/core_ext/string'
 
 module DecentExposure
   class Inflector
-    attr_reader :string, :original
+    attr_reader :string, :original, :model
     alias name string
 
-    def initialize(name)
-      @original = name
-      @string = name.to_s.demodulize
+    def initialize(name, model=nil)
+      @original = name.to_s
+      @model = model
+      @string = (model || name).to_s.demodulize
     end
 
     def constant(context=Object)
-      case original
+      case model
       when Module, Class
-        original
+        model
       else
-        context.const_get string.classify
+        ConstantResolver.new(context, string.classify).constant
       end
     end
 
@@ -25,7 +26,7 @@ module DecentExposure
     end
 
     def singular
-      string.parameterize
+      @singular ||= string.singularize.parameterize
     end
 
     def plural
@@ -34,7 +35,37 @@ module DecentExposure
     alias collection plural
 
     def plural?
-      plural == string
+      original.pluralize == original && !uncountable?
+    end
+
+    def uncountable?
+      original.pluralize == original.singularize
+    end
+
+    private
+
+    ConstantResolver = Struct.new :context, :constant_name do
+
+      def constant
+        immediate_child || namespace_qualified
+      end
+
+      private
+
+      def immediate_child
+        context.constants.map do |c|
+          context.const_get(c) if c.to_s == constant_name
+        end.compact.first
+      end
+
+      def namespace_qualified
+        namespace.const_get(constant_name)
+      end
+
+      def namespace
+        path = context.to_s
+        path[0...(path.rindex('::') || 0)].constantize
+      end
     end
   end
 end

data/lib/decent_exposure/version.rb

@@ -1,3 +1,3 @@
 module DecentExposure #:nodoc
-  VERSION = "2.0.0"
+  VERSION = "2.0.1"
 end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: decent_exposure
 version: !ruby/object:Gem::Version
-  version: 2.0.0
   prerelease: 
+  version: 2.0.1
 platform: ruby
 authors:
 - Stephen Caudill
@@ -11,72 +11,72 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-10 00:00:00.000000000 Z
+date: 2012-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.7'
+    none: false
+  name: rspec
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.7'
-- !ruby/object:Gem::Dependency
-  name: rspec-rails
-  requirement: !ruby/object:Gem::Requirement
     none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.7'
+    none: false
+  name: rspec-rails
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.7'
-- !ruby/object:Gem::Dependency
-  name: actionpack
-  requirement: !ruby/object:Gem::Requirement
     none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
+    none: false
+  name: actionpack
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
     none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
+    none: false
+  name: activesupport
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
+    none: false
 description: ! "\n    DecentExposure helps you program to an interface, rather than
   an\n    implementation in your Rails controllers.  The fact of the matter is that\n
   \   sharing state via instance variables in controllers promotes close coupling\n
@@ -107,17 +107,17 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
+  none: false
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24