decent_exposure 2.0.0.rc1 → 2.0.0

data/lib/decent_exposure/expose.rb

@@ -5,7 +5,9 @@ module DecentExposure
   module Expose
     def self.extended(base)
       base.class_eval do
-        class_attribute :_default_exposure
+        class_attribute :_default_exposure, :_decent_configurations
+        self._decent_configurations ||= Hash.new(Configuration.new)
+
         def _resources
           @_resources ||= {}
         end
@@ -17,10 +19,6 @@ module DecentExposure
       @_exposures ||= {}
     end
 
-    def _decent_configurations
-      @_decent_configurations ||= Hash.new(Configuration.new)
-    end
-
     def decent_configuration(name=:default,&block)
       _decent_configurations[name] = Configuration.new(&block)
     end
@@ -39,6 +37,13 @@ module DecentExposure
     end
 
     def expose(name, options={:default_exposure => _default_exposure}, &block)
+      if ActionController::Base.instance_methods.include?(name.to_sym)
+        Kernel.warn "[WARNING] You are exposing the `#{name}` method, " \
+          "which overrides an existing ActionController method of the same name. " \
+          "Consider a different exposure name\n" \
+          "#{caller.first}"
+      end
+
       config = options[:config] || :default
       options = _decent_configurations[config].merge(options)
 

data/lib/decent_exposure/inflector.rb

@@ -3,15 +3,21 @@ require 'active_support/core_ext/string/inflections'
 
 module DecentExposure
   class Inflector
-    attr_reader :original
-    alias name original
+    attr_reader :string, :original
+    alias name string
 
     def initialize(name)
-      @original = name.to_s
+      @original = name
+      @string = name.to_s.demodulize
     end
 
-    def constant
-      original.classify.constantize
+    def constant(context=Object)
+      case original
+      when Module, Class
+        original
+      else
+        context.const_get string.classify
+      end
     end
 
     def parameter
@@ -19,16 +25,16 @@ module DecentExposure
     end
 
     def singular
-      original.parameterize
+      string.parameterize
     end
 
     def plural
-      original.pluralize
+      string.pluralize
     end
     alias collection plural
 
     def plural?
-      plural == original
+      plural == string
     end
   end
 end

data/lib/decent_exposure/strategy.rb

@@ -17,7 +17,7 @@ module DecentExposure
     protected
 
     def model
-      inflector.constant
+      inflector.constant(controller.class)
     end
 
     def params

data/lib/decent_exposure/version.rb

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

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: decent_exposure
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc1
-  prerelease: 6
+  version: 2.0.0
+  prerelease: 
 platform: ruby
 authors:
 - Stephen Caudill
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-27 00:00:00.000000000Z
+date: 2012-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70110875340260 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +23,15 @@ dependencies:
         version: '2.7'
   type: :development
   prerelease: false
-  version_requirements: *70110875340260
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70110875338840 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -34,10 +39,15 @@ dependencies:
         version: '2.7'
   type: :development
   prerelease: false
-  version_requirements: *70110875338840
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &70110875338380 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -45,10 +55,15 @@ dependencies:
         version: '3.1'
   type: :development
   prerelease: false
-  version_requirements: *70110875338380
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70110875337880 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -56,7 +71,12 @@ dependencies:
         version: '3.1'
   type: :development
   prerelease: false
-  version_requirements: *70110875337880
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.1'
 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
@@ -100,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A helper for creating declarative interfaces in controllers