inherited_rails_views 1.0.0 → 1.1.0

data/Readme.md

@@ -17,5 +17,7 @@ Add the inherited_rails_views gem to your Applications Gemfile:
 
 		# now all attributes of collection are shown in the views.
 		# You can, however, specify which ones should be used.
-		inherited_attributes :attr1, :attr2, :attr3 => {:value => "Custom Titled Attribute", :type => :checkbox}
+		before_filter do
+			inherited_attributes :attr1, :attr2, :attr3 => {:value => "Custom Titled Attribute", :type => :checkbox}
+		end
 	end

data/inherited_rails_views.gemspec

@@ -19,9 +19,8 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   # specify any dependencies here; for example:
-  s.add_development_dependency "rspec"
-  s.add_development_dependency "activesupport"
-	s.add_development_dependency "actionpack"
-  # s.add_runtime_dependency "rest-client"
-  s.add_dependency "dsl_accessors"
+	s.add_dependency "activesupport"
+
+	s.add_development_dependency "rspec"
+  s.add_development_dependency "actionpack"
 end

data/lib/inherited_rails_views.rb

@@ -1,42 +1,46 @@
 require "inherited_rails_views/version"
 
-require 'dsl_accessors'
-
 require 'active_support/core_ext/class'
 require 'active_support/core_ext/array'
 require 'active_support/core_ext/module'
 
 require 'active_support/concern'
 
+
+# sets the attributes to be displayed by inherited_rails_views
+#
+#  inherited_attributes :method1, :method2, :method3
+#
+# It is also possible to set the form_helper method to be used, and the title of the label
+#
+#  inherited_attributes :method1 => {:value => true, :type => :text_field},
+#    :method2 => {:value => "Password", :type => :password_field}
+#
+# They array and hash can also be combined
+#
+# inherited_attributes :method1, :method2, :method3 => {:value => "Password", :type => :password_field}
+#
 module InheritedRailsViews
 	extend ActiveSupport::Concern
 
 	included do
 		append_view_path(File.expand_path "../inherited_rails_views/views", __FILE__)
+		
 		helper_method :inherited_attributes
 	end
 
+
 	module InstanceMethods
-		include DslAccessors
-		attr_accessor :inherited_attributes
+		def inherited_attributes(*args)
+			if args.empty?
+				@_inherited_attributes || _default_inherited_attributes
+			else
+				_set_inherited_attributes(*args)
+			end
+		end
 
-		# sets the attributes to be displayed by inherited_rails_views
-		#
-		#  inherited_attributes :method1, :method2, :method3
-		#
-		# It is also possible to provide a hash
-		#  inherited_attributes :method1 => true, :method2 => "Title of Method 2"
-		#
-		# It is even possible to set the form_helper method to be used
-		#
-		#  inherited_attributes :method1 => {:value => true, :type => :text_field},
-		#    :method2 => {:value => "Password", :type => :password_field}
-		#
-		# They array and hash can also be combined
-		#
-		# inherited_attributes :method1, :method2, :method3 => {:value => "Password", :type => :password_field}
-		#
-		def set_inherited_attributes(*args)
+		private
+		def _set_inherited_attributes(*args)
 			# extract the hash attributes
 			options = args.extract_options!
 
@@ -48,19 +52,13 @@ module InheritedRailsViews
 			end
 
 			# add array methods to the hash and store the result in @inherited_attributes
-			@inherited_attributes = args.inject(options) do |h, e|
+			@_inherited_attributes = args.inject(options) do |h, e|
 				h[e] = {:value => e.to_s.titleize, :type => :text_field}
 				h
 			end
 		end
 
-		def inherited_attributes_with_defaults(*args)
-			inherited_attributes_without_defaults(*args) || default_inherited_attributes
-		end
-		alias_method_chain :inherited_attributes, :defaults
-		
-		private
-		def default_inherited_attributes
+		def _default_inherited_attributes
 			klass = collection.respond_to?(:klass) ? collection.klass : collection.class
 			attributes = klass.attribute_names - %w(id created_at updated_at)
 			self.inherited_attributes *attributes.map(&:to_sym)

data/lib/inherited_rails_views/version.rb

@@ -1,3 +1,3 @@
 module InheritedRailsViews
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/spec/inherited_rails_views_spec.rb

@@ -20,8 +20,9 @@ describe "InheritedRailsViews" do
 
 	it "should transform a list of methods to a hash" do
 		@klass.inherited_attributes :a, :hello_world
-		@klass.inherited_attributes.should eql({:a => {:value => 'A', :type => :text_field},
-																						:hello_world => {:value => "Hello World", :type => :text_field}})
+		@klass.inherited_attributes.
+				should eql({:a => {:value => 'A', :type => :text_field},
+										:hello_world => {:value => "Hello World", :type => :text_field}})
 	end
 
 	it "should accept a hash" do
@@ -29,10 +30,12 @@ describe "InheritedRailsViews" do
 																:bar_foo => {:value => "Bar Foo",
 																						 :type => :checkbox}
 
-		@klass.instance_variable_get(:@inherited_attributes).should eql({
-				:hello_world => {:value => "Hello World", :type => :text_field},
-				:foo_bar => {:value => "FBar", :type => :text_field},
-				:bar_foo => {:value => "Bar Foo", :type => :checkbox}
-				})
+		@klass.instance_variable_get(:@_inherited_attributes).
+				should eql({
+											 :hello_world => {:value => "Hello World", :type => :text_field},
+											 :foo_bar => {:value => "FBar", :type => :text_field},
+											 :bar_foo => {:value => "Bar Foo", :type => :checkbox}
+									 })
 	end
-end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inherited_rails_views
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-11 00:00:00.000000000Z
+date: 2011-09-13 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &70105623241200 !ruby/object:Gem::Requirement
+  name: activesupport
+  requirement: &70208295656260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
-  version_requirements: *70105623241200
+  version_requirements: *70208295656260
 - !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: &70105623240600 !ruby/object:Gem::Requirement
+  name: rspec
+  requirement: &70208295655360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70105623240600
+  version_requirements: *70208295655360
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &70105623240020 !ruby/object:Gem::Requirement
+  requirement: &70208295654380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,18 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70105623240020
-- !ruby/object:Gem::Dependency
-  name: dsl_accessors
-  requirement: &70105623239360 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *70105623239360
+  version_requirements: *70208295654380
 description: 
 email:
 - robin@wenglewski.de