puffer 0.0.3 → 0.0.4

data/spec/lib/resource_spec.rb

@@ -156,36 +156,59 @@ describe Puffer::Resource do
       resource = Puffer::Resource.new default_params
 
       Category.stub(:new) {@category}
+
       resource.new_member.should == @category
     end
 
+    it "no parent with attributes" do
+      resource = Puffer::Resource.new default_params.merge(:category => {:title => 'my new title'})
+
+      resource.new_member.title.should == 'my new title'
+    end
+
     it "plural parent" do
       resource = Puffer::Resource.new default_params.merge(:ancestors => [:posts], :post_id => 42)
 
       @categories = @post.categories
-
       Post.stub(:find).with(42) {@post}
       @categories.stub(:new) {@category}
+
       resource.new_member.should == @category
     end
 
+    it "plural parent with attributes" do
+      resource = Puffer::Resource.new default_params.merge(:ancestors => [:posts], :post_id => 42, :category => {:title => 'my new title'})
+
+      @categories = @post.categories
+      Post.stub(:find).with(42) {@post}
+
+      resource.new_member.title.should == 'my new title'
+    end
+
     it "singular" do
       resource = Puffer::Resource.new default_params.merge(:controller => 'admin/profiles', :plural => false, :ancestors => [:users], :user_id => 42)
 
       @profile = @user.profile
-
       User.stub(:find).with(42) {@user}
       @user.stub(:build_profile) {@profile}
 
       resource.new_member.should == @profile
     end
 
+    it "singular with attributes" do
+      resource = Puffer::Resource.new default_params.merge(:controller => 'admin/profiles', :plural => false, :ancestors => [:users], :user_id => 42, :profile => {:name => 'my new name'})
+
+      @profile = @user.profile
+      User.stub(:find).with(42) {@user}
+
+      resource.new_member.name.should == 'my new name'
+    end
+
     it "singular parent" do
       resource = Puffer::Resource.new default_params.merge(:controller => 'admin/tags', :ancestors => [:users, :profile], :user_id => 42)
 
       @profile = @user.profile
       @tag = @profile.tags.first
-
       User.stub(:find).with(42) {@user}
       @user.stub(:profile) {@profile}
       @profile.tags.stub(:new) {@tag}
@@ -193,6 +216,17 @@ describe Puffer::Resource do
       resource.new_member.should == @tag
     end
 
+    it "singular parent with attributes" do
+      resource = Puffer::Resource.new default_params.merge(:controller => 'admin/tags', :ancestors => [:users, :profile], :user_id => 42, :tag => {:name => 'my new name'})
+
+      @profile = @user.profile
+      @tag = @profile.tags.first
+      User.stub(:find).with(42) {@user}
+      @user.stub(:profile) {@profile}
+
+      resource.new_member.name.should == 'my new name'
+    end
+
   end
 
 end

data/spec/spec_helper.rb

@@ -1,5 +1,6 @@
 # Configure Rails Envinronment
-ENV["RAILS_ENV"] = "test"
+ENV["RAILS_ENV"] ||= "test"
+Bundler.require(:default, ENV["RAILS_ENV"])
 
 require File.expand_path("../dummy/config/environment.rb",  __FILE__)
 require "rails/test_help"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: puffer
 version: !ruby/object:Gem::Version 
-  hash: 25
-  prerelease: false
+  hash: 23
+  prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - pyromaniac
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-30 00:00:00 +03:00
+date: 2011-01-03 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,24 +32,25 @@ dependencies:
         version: 3.0.3
   requirement: *id001
   prerelease: false
-  type: :runtime
   name: rails
+  type: :runtime
 - !ruby/object:Gem::Dependency 
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 31098121
+        hash: 1923831917
         segments: 
         - 3
         - 0
-        - beta
-        version: 3.0.beta
+        - pre
+        - 2
+        version: 3.0.pre2
   requirement: *id002
   prerelease: false
-  type: :runtime
   name: will_paginate
+  type: :runtime
 - !ruby/object:Gem::Dependency 
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -64,8 +65,8 @@ dependencies:
         version: 0.4.0
   requirement: *id003
   prerelease: false
-  type: :development
   name: capybara
+  type: :development
 - !ruby/object:Gem::Dependency 
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -78,8 +79,8 @@ dependencies:
         version: "0"
   requirement: *id004
   prerelease: false
-  type: :development
   name: sqlite3-ruby
+  type: :development
 - !ruby/object:Gem::Dependency 
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -92,8 +93,8 @@ dependencies:
         version: "0"
   requirement: *id005
   prerelease: false
-  type: :development
   name: rspec-rails
+  type: :development
 - !ruby/object:Gem::Dependency 
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -106,8 +107,8 @@ dependencies:
         version: "0"
   requirement: *id006
   prerelease: false
-  type: :development
   name: autotest
+  type: :development
 - !ruby/object:Gem::Dependency 
   version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
@@ -120,8 +121,8 @@ dependencies:
         version: "0"
   requirement: *id007
   prerelease: false
-  type: :development
   name: forgery
+  type: :development
 - !ruby/object:Gem::Dependency 
   version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
@@ -134,8 +135,8 @@ dependencies:
         version: "0"
   requirement: *id008
   prerelease: false
-  type: :development
   name: fabrication
+  type: :development
 - !ruby/object:Gem::Dependency 
   version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
@@ -148,8 +149,8 @@ dependencies:
         version: "0"
   requirement: *id009
   prerelease: false
-  type: :development
   name: jeweler
+  type: :development
 description: In Soviet Russia puffer admins you
 email: kinwizard@gmail.com
 executables: []
@@ -186,6 +187,13 @@ files:
 - lib/generators/puffer/controller/templates/controller.rb
 - lib/generators/puffer/install/USAGE
 - lib/generators/puffer/install/install_generator.rb
+- lib/generators/puffer/install/templates/puffer.rb
+- lib/generators/puffer/install/templates/puffer/javascripts/application.js
+- lib/generators/puffer/install/templates/puffer/javascripts/controls.js
+- lib/generators/puffer/install/templates/puffer/javascripts/dragdrop.js
+- lib/generators/puffer/install/templates/puffer/javascripts/effects.js
+- lib/generators/puffer/install/templates/puffer/javascripts/prototype.js
+- lib/generators/puffer/install/templates/puffer/javascripts/rails.js
 - lib/puffer.rb
 - lib/puffer/base.rb
 - lib/puffer/controller/actions.rb
@@ -197,7 +205,8 @@ files:
 - lib/puffer/extensions/controller.rb
 - lib/puffer/extensions/core.rb
 - lib/puffer/extensions/mapper.rb
-- lib/puffer/field.rb
+- lib/puffer/fields.rb
+- lib/puffer/fields/field.rb
 - lib/puffer/railtie.rb
 - lib/puffer/resource.rb
 - lib/puffer/resource/routing.rb
@@ -260,6 +269,7 @@ files:
 - spec/fabricators/tags_fabricator.rb
 - spec/fabricators/users_fabricator.rb
 - spec/integration/navigation_spec.rb
+- spec/lib/fields_spec.rb
 - spec/lib/params_spec.rb
 - spec/lib/render_fallback_spec.rb
 - spec/lib/resource/routing_spec.rb
@@ -296,7 +306,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.4.1
 signing_key: 
 specification_version: 3
 summary: Admin interface builder
@@ -341,6 +351,7 @@ test_files:
 - spec/fabricators/tags_fabricator.rb
 - spec/fabricators/users_fabricator.rb
 - spec/integration/navigation_spec.rb
+- spec/lib/fields_spec.rb
 - spec/lib/params_spec.rb
 - spec/lib/render_fallback_spec.rb
 - spec/lib/resource/routing_spec.rb

data/lib/puffer/field.rb

@@ -1,88 +0,0 @@
-module Puffer
-  class Field
-
-    attr_accessor :name, :options, :main_model
-
-    def initialize(model, name, options = {})
-      @main_model = model
-      @name = name
-      @options = options
-    end
-
-    def order
-      @order ||= options[:order] || query_column
-    end
-
-    def label
-      @label ||= options[:label] || @name.to_s.humanize
-    end
-
-    def [](key)
-      @options[key]
-    end
-
-    def to_s
-      @name.to_s
-    end
-
-    def own?
-      model == main_model
-    end
-
-    def toggable?
-      options[:toggable] = true if options[:toggable].nil?
-      own? && type == :boolean && options[:toggable]
-    end
-
-    def association
-      @association ||= main_model.reflect_on_association(to_s.split('.').first.to_sym)
-    end
-
-    def association?
-      !!association
-    end
-
-    def collection?
-      association? && [:has_many, :has_and_belongs_to_many].include?(association.macro)
-    end
-
-    def association_fields
-      @association_fields ||= @options[:fields].map {|sym| self.class.new(association.klass, sym) }
-    end
-
-    def association_key
-      association.primary_key_name
-    end
-
-    def record
-      name.split('.')[0..-2].join('.')
-    end
-
-    def model
-      unless @model
-        try_model = to_s.split('.')[-2]
-        @model = try_model.classify.constantize rescue nil if try_model
-        @model ||= main_model
-      end
-      @model
-    end
-
-    def type
-      @options[:type] = :association if association?
-      @options[:type].to_sym || swallow_nil{column.type}
-    end
-
-    def column
-      @column ||= model.columns.detect { |c| c.name == to_s.split('.').last}
-    end
-
-    def column?
-      !!column
-    end
-
-    def query_column
-      "#{model.to_s.tableize}.#{to_s.split('.').last}" if column
-    end
-
-  end
-end