decent_exposure 2.1.0 → 2.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: bb111212d14e0e4556fa3b3503a1a93ba68ea723
+  data.tar.gz: d8f9aa40d3934c500b367016efb5f86b8e98a0a8
+SHA512:
+  metadata.gz: e5ccc36891dc074355e8d7c01e0fe0c1ff2e244371ba60dc2d8076095158cd32a64679a58b3291989c458c9f9a2162fbd61dac616b916cf0752c42a94b36112a
+  data.tar.gz: e0a369915128c353be4d1671f711a4aaffec0330d81cdef76da77dd62356f982e422cf9cbe05363465224490ffcb8acfdc92f43fad06615267a7f56894450282

data/README.md

@@ -1,3 +1,5 @@
+[![Gem Version](https://badge.fury.io/rb/decent_exposure.png)](http://badge.fury.io/rb/decent_exposure) [![Build Status](https://api.travis-ci.org/voxdolo/decent_exposure.png?branch=master)](https://travis-ci.org/voxdolo/decent_exposure) [![Code Climate](https://codeclimate.com/github/voxdolo/decent_exposure.png)](https://codeclimate.com/github/voxdolo/decent_exposure)
+
 ## Mad Decent
 
 Rails controllers are the sweaty armpit of every rails app. This is due, in
@@ -76,7 +78,7 @@ handling all that repetitive initialization, as we'll see next.
 
 Even if you decide not to use `decent_exposure`, do yourself a favor and stop
 using instance variables in your views. Your code will be cleaner and easier to
-refactor as a result. If you want to learn more about his approach, I've
+refactor as a result. If you want to learn more about this approach, I've
 expanded on my thoughts in the article [A Diatribe on Maintaining State][1].
 
 ## Environmental Awareness

data/lib/decent_exposure/active_record_strategy.rb

@@ -10,7 +10,7 @@ module DecentExposure
     end
 
     def scope
-      if options[:ancestor]
+      @scope ||= if options[:ancestor]
         ancestor_scope
       else
         default_scope
@@ -38,7 +38,8 @@ module DecentExposure
     end
 
     def collection_resource
-      scope.scoped
+      return scope if scope.respond_to?(:each)
+      scope.send(scope_method)
     end
 
     def id
@@ -64,5 +65,15 @@ module DecentExposure
         singular_resource
       end
     end
+
+    private
+
+    def scope_method
+      if defined?(ActiveRecord) && ActiveRecord::VERSION::MAJOR > 3
+        :all
+      else
+        :scoped
+      end
+    end
   end
 end

data/lib/decent_exposure/active_record_with_eager_attributes_strategy.rb

@@ -10,7 +10,7 @@ module DecentExposure
     end
 
     def attributes
-      params[inflector.singular] || {}
+      params[options[:param_key] || inflector.param_key] || {}
     end
 
     def assign_attributes?

data/lib/decent_exposure/constant_resolver.rb

@@ -0,0 +1,32 @@
+require 'active_support/inflector'
+require 'active_support/core_ext/string'
+
+module DecentExposure
+  class ConstantResolver
+    attr_reader :context, :constant_name
+    def initialize(constant_name, context=Object)
+      @context, @constant_name = context, constant_name.classify
+    end
+
+    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

data/lib/decent_exposure/exposure.rb

@@ -2,16 +2,16 @@ require 'decent_exposure/inflector'
 
 module DecentExposure
   class Exposure
-    attr_accessor :inflector, :strategy, :options
+    attr_accessor :name, :strategy, :options
 
     def initialize(name, strategy, options)
+      self.name = name.to_s
       self.strategy = strategy
       self.options = options
-      self.inflector = DecentExposure::Inflector.new(name, options[:model])
     end
 
     def call(controller)
-      strategy.new(controller, inflector, options).resource
+      strategy.new(controller, name, options).resource
     end
   end
 end

data/lib/decent_exposure/inflector.rb

@@ -1,38 +1,32 @@
 require 'active_support/inflector'
 require 'active_support/core_ext/string'
+require 'active_model/naming'
 
 module DecentExposure
   class Inflector
-    attr_reader :string, :original, :model
-    alias name string
+    attr_reader :original, :model
 
-    def initialize(name, model=nil)
+    def initialize(name, model)
       @original = name.to_s
       @model = model
-      @string = (model || name).to_s.demodulize
     end
 
-    def constant(context=Object)
-      case model
-      when Module, Class
-        model
-      else
-        ConstantResolver.new(context, string.classify).constant
-      end
-    end
+    alias name original
 
-    def parameter
-      singular + "_id"
+    def model_name
+      @model_name ||= if model.respond_to?(:model_name)
+                        model.model_name
+                      else
+                        ActiveModel::Name.new(model)
+                      end
     end
 
-    def singular
-      @singular ||= string.singularize.parameterize
-    end
+    delegate :singular, :plural, :param_key, :to => :model_name
+    alias collection plural
 
-    def plural
-      string.pluralize
+    def parameter
+      "#{model_name.singular}_id"
     end
-    alias collection plural
 
     def plural?
       original.pluralize == original && !uncountable?
@@ -41,31 +35,5 @@ module DecentExposure
     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/strategizer.rb

@@ -9,7 +9,7 @@ module DecentExposure
     def initialize(name, options={})
       self.name = name
       self.custom_strategy_class = options.delete(:strategy)
-      self.options = options
+      self.options = options.merge(:name => name)
       self.block = Proc.new if block_given?
     end
 

data/lib/decent_exposure/strategy.rb

@@ -1,13 +1,13 @@
+require 'decent_exposure/inflector'
+require 'decent_exposure/constant_resolver'
+
 module DecentExposure
   class Strategy
-    attr_reader :controller, :inflector, :options
-
-    def initialize(controller, inflector, options={})
-      @controller, @inflector, @options = controller, inflector, options
-    end
+    attr_reader :controller, :name, :options
+    attr_writer :model, :inflector
 
-    def name
-      inflector.name
+    def initialize(controller, name, options={})
+      @controller, @name, @options = controller, name.to_s, options
     end
 
     def resource
@@ -16,8 +16,18 @@ module DecentExposure
 
     protected
 
+    def inflector
+      @inflector ||= DecentExposure::Inflector.new(name, model)
+    end
+
     def model
-      inflector.constant(controller.class)
+      @model ||= case options[:model]
+                 when Class, Module
+                   options[:model]
+                 else
+                   name_or_model = options[:model] || name
+                   DecentExposure::ConstantResolver.new(name_or_model.to_s, controller.class).constant
+                 end
     end
 
     def params

data/lib/decent_exposure/version.rb

@@ -1,3 +1,3 @@
 module DecentExposure #:nodoc
-  VERSION = "2.1.0"
+  VERSION = "2.2.0"
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decent_exposure
 version: !ruby/object:Gem::Version
-  prerelease: 
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Stephen Caudill
@@ -11,73 +10,65 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-12 00:00:00.000000000 Z
+date: 2013-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.11'
-    none: false
-  name: rspec
   type: :development
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.11'
-    none: false
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.11'
-    none: false
-  name: rspec-rails
   type: :development
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.11'
-    none: false
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: actionpack
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.1.0
-    none: false
-  name: actionpack
   type: :development
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.1.0
-    none: false
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.1.0
-    none: false
-  name: activesupport
   type: :development
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.1.0
-    none: false
-description: ! "\n    DecentExposure helps you program to an interface, rather than
+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
   \   with views.  DecentExposure gives you a declarative manner of exposing an\n
@@ -91,6 +82,7 @@ files:
 - lib/decent_exposure/active_record_strategy.rb
 - lib/decent_exposure/active_record_with_eager_attributes_strategy.rb
 - lib/decent_exposure/configuration.rb
+- lib/decent_exposure/constant_resolver.rb
 - lib/decent_exposure/expose.rb
 - lib/decent_exposure/exposure.rb
 - lib/decent_exposure/inflector.rb
@@ -102,6 +94,7 @@ files:
 - README.md
 homepage: http://github.com/voxdolo/decent_exposure
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --charset=UTF-8
@@ -109,20 +102,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-  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
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A helper for creating declarative interfaces in controllers
 test_files: []