sferik-merb-admin 0.3.2 → 0.3.3

data/README.markdown

@@ -14,7 +14,7 @@ At the command prompt, type:
 
 In your app, add the following dependency to `config/dependencies.rb`:
 
-    dependency "sferik-merb-admin", "0.3.2", :require_as => "merb-admin"
+    dependency "sferik-merb-admin", "0.3.3", :require_as => "merb-admin"
     dependency "dm-is-paginated", "0.0.1" # if you want pagination support
 
 Add the following route to `config/router.rb`:

data/Rakefile

@@ -12,7 +12,7 @@ AUTHOR = "Erik Michaels-Ober"
 EMAIL = "sferik@gmail.com"
 HOMEPAGE = "http://twitter.com/sferik"
 SUMMARY = "MerbAdmin is a Merb plugin that provides an easy-to-use interface for managing your data."
-GEM_VERSION = "0.3.2"
+GEM_VERSION = "0.3.3"
 
 spec = Gem::Specification.new do |s|
   s.rubyforge_project = "merb"

data/app/controllers/main.rb

@@ -9,7 +9,7 @@ class MerbAdmin::Main < MerbAdmin::Application
   before :find_object, :only => ['edit', 'update', 'delete', 'destroy']
 
   def index
-    render(:layout => "dashboard")
+    render(:layout => 'dashboard')
   end
 
   def list
@@ -25,7 +25,7 @@ class MerbAdmin::Main < MerbAdmin::Application
       @objects = @abstract_model.find_all(options).reverse
     else
       # monkey patch pagination
-      @abstract_model.model.class_eval("is_paginated") unless @abstract_model.model.respond_to?(:paginated)
+      @abstract_model.model.class_eval('is_paginated') unless @abstract_model.model.respond_to?(:paginated)
       @current_page = (params[:page] || 1).to_i
       options = {
         :page => @current_page,
@@ -39,16 +39,16 @@ class MerbAdmin::Main < MerbAdmin::Application
     end
 
     @record_count = @abstract_model.count(options)
-    render(:layout => "list")
+    render(:layout => 'list')
   end
 
   def new
     @object = @abstract_model.new
-    render(:layout => "form")
+    render(:layout => 'form')
   end
 
   def edit
-    render(:layout => "form")
+    render(:layout => 'form')
   end
 
   def create
@@ -57,9 +57,10 @@ class MerbAdmin::Main < MerbAdmin::Application
     object.each do |key, value|
       object[key] = nil if value.blank?
     end
-    associations = @abstract_model.has_many_associations.map{|association| [association, (params[:associations] || {}).delete(association[:name])]}
+    has_one_associations = @abstract_model.has_one_associations.map{|association| [association, (params[:associations] || {}).delete(association[:name])]}
+    has_many_associations = @abstract_model.has_many_associations.map{|association| [association, (params[:associations] || {}).delete(association[:name])]}
     @object = @abstract_model.new(object)
-    if @object.save && associations.each{|association, ids| update_has_many_association(association, ids)}
+    if @object.save && has_one_associations.each{|association, id| update_has_one_association(association, id)} && has_many_associations.each{|association, ids| update_has_many_association(association, ids)}
       if params[:_continue]
         redirect(slice_url(:admin_edit, :model_name => @abstract_model.singular_name, :id => @object.id), :message => {:notice => "#{@abstract_model.pretty_name.capitalize} was successfully created"})
       elsif params[:_add_another]
@@ -69,7 +70,7 @@ class MerbAdmin::Main < MerbAdmin::Application
       end
     else
       message[:error] = "#{@abstract_model.pretty_name.capitalize} failed to be created"
-      render(:new, :layout => "form")
+      render(:new, :layout => 'form')
     end
   end
 
@@ -79,8 +80,9 @@ class MerbAdmin::Main < MerbAdmin::Application
     object.each do |key, value|
       object[key] = nil if value.blank?
     end
-    associations = @abstract_model.has_many_associations.map{|association| [association, (params[:associations] || {}).delete(association[:name])]}
-    if @object.update_attributes(object) && associations.each{|association, ids| update_has_many_association(association, ids)}
+    has_one_associations = @abstract_model.has_one_associations.map{|association| [association, (params[:associations] || {}).delete(association[:name])]}
+    has_many_associations = @abstract_model.has_many_associations.map{|association| [association, (params[:associations] || {}).delete(association[:name])]}
+    if @object.update_attributes(object) && has_one_associations.each{|association, id| update_has_one_association(association, id)} && has_many_associations.each{|association, ids| update_has_many_association(association, ids)} 
       if params[:_continue]
         redirect(slice_url(:admin_edit, :model_name => @abstract_model.singular_name, :id => @object.id), :message => {:notice => "#{@abstract_model.pretty_name.capitalize} was successfully updated"})
       elsif params[:_add_another]
@@ -90,12 +92,12 @@ class MerbAdmin::Main < MerbAdmin::Application
       end
     else
       message[:error] = "#{@abstract_model.pretty_name.capitalize} failed to be updated"
-      render(:edit, :layout => "form")
+      render(:edit, :layout => 'form')
     end
   end
 
   def delete
-    render(:layout => "form")
+    render(:layout => 'form')
   end
 
   def destroy
@@ -133,7 +135,7 @@ class MerbAdmin::Main < MerbAdmin::Application
       @properties.each do |property|
         next unless property[:name] == key.to_sym
         if property[:type] == :boolean
-          options.merge!(key.to_sym => (value == "true"))
+          options.merge!(key.to_sym => (value == 'true'))
         elsif property[:type] == :integer && property[:flag_map]
           options.merge!(key.to_sym => value.to_sym)
         end
@@ -150,8 +152,8 @@ class MerbAdmin::Main < MerbAdmin::Application
       condition_statement << "#{property[:name]} LIKE ?"
       conditions << "%#{params[:query]}%"
     end
-    conditions.unshift(condition_statement.join(" OR "))
-    options.merge!(:conditions => conditions) unless conditions == [""]
+    conditions.unshift(condition_statement.join(' OR '))
+    options.merge!(:conditions => conditions) unless conditions == ['']
   end
 
   def merge_sort(options)
@@ -159,6 +161,13 @@ class MerbAdmin::Main < MerbAdmin::Application
     options.merge!(:order => [params[:sort].to_sym.send(params[:sort_reverse] ? :desc : :asc)])
   end
 
+  def update_has_one_association(association, id)
+    model = MerbAdmin::AbstractModel.new(association[:child_model])
+    if object = model.find(id)
+      object.update_attributes(association[:child_key] => @object.id)
+    end
+  end
+
   def update_has_many_association(association, ids)
     # Remove all of the associated items
     relationship = @object.send(association[:name])

data/lib/merb-admin.rb

@@ -23,7 +23,7 @@ if defined?(Merb::Plugins)
 
     # Slice metadata
     self.description = "MerbAdmin is a Merb plugin that provides an easy-to-use interface for managing your data."
-    self.version = "0.3.2"
+    self.version = "0.3.3"
     self.author = "Erik Michaels-Ober"
 
     # Stub classes loaded hook - runs before LoadClasses BootLoader

data/spec/controllers/main_spec.rb

@@ -20,10 +20,6 @@ describe MerbAdmin::Main do
     @controller.app_path_for(:image).should == "#{Merb.root}/public/slices/merb-admin/images"
     @controller.app_path_for(:javascript).should == "#{Merb.root}/public/slices/merb-admin/javascripts"
     @controller.app_path_for(:stylesheet).should == "#{Merb.root}/public/slices/merb-admin/stylesheets"
-
-    @controller.slice_path_for(:image).should == "#{Merb.root}/public/images"
-    @controller.slice_path_for(:javascript).should == "#{Merb.root}/public/javascripts"
-    @controller.slice_path_for(:stylesheet).should == "#{Merb.root}/public/stylesheets"  
   end
 
 end

data/spec/requests/main_spec.rb

@@ -4,6 +4,13 @@ given "a player exists" do
   @player = Player.gen
 end
 
+given "two drafts exist" do
+  @drafts = []
+  2.times do
+    @drafts << Draft.gen
+  end
+end
+
 given "two players exist" do
   @players = []
   2.times do
@@ -11,13 +18,21 @@ given "two players exist" do
   end
 end
 
-given "three teams exists" do
+given "three teams exist" do
   @teams = []
   3.times do
     @teams << Team.gen
   end
 end
 
+given "a player exists and two drafts exist" do
+  @player = Player.gen
+  @drafts = []
+  2.times do
+    @drafts << Draft.gen
+  end
+end
+
 given "a player exists and three teams exist" do
   @player = Player.gen
   @teams = []
@@ -265,7 +280,7 @@ describe "MerbAdmin" do
     end
   end
 
-  describe "new with has-many association", :given => "three teams exists" do
+  describe "new with has-one association", :given => "two drafts exist" do
     before(:each) do
       @response = request(url(:admin_new, :model_name => "player"))
     end
@@ -275,6 +290,15 @@ describe "MerbAdmin" do
     end
   end
 
+  describe "new with has-many association", :given => "three teams exist" do
+    before(:each) do
+      @response = request(url(:admin_new, :model_name => "player"))
+    end
+
+    it "should respond sucessfully" do
+      @response.should be_successful
+    end
+  end
 
   describe "edit", :given => "a player exists" do
     before(:each) do
@@ -290,6 +314,16 @@ describe "MerbAdmin" do
     end
   end
 
+  describe "edit with has-one association", :given => "a player exists and two drafts exist" do
+    before(:each) do
+      @response = request(url(:admin_edit, :model_name => "player", :id => @player.id))
+    end
+
+    it "should respond sucessfully" do
+      @response.should be_successful
+    end
+  end
+
   describe "edit with has-many association", :given => "a player exists and three teams exist" do
     before(:each) do
       @response = request(url(:admin_edit, :model_name => "player", :id => @player.id))
@@ -353,7 +387,25 @@ describe "MerbAdmin" do
     end
   end
 
-  describe "create with has-many association", :given => "three teams exists" do
+  describe "create with has-one association", :given => "two drafts exist" do
+    before(:each) do
+      @response = request(url(:admin_create, :model_name => "player"), :method => "post", :params => {:player => {:name => "Jackie Robinson", :number => 42, :team_id => 1, :position => :second, :sex => :male}, :associations => {:draft => @drafts[0].id}})
+    end
+
+    it "should create a new object" do
+      Player.first.should_not be_nil
+    end
+
+    it "should include correct associations" do
+      Player.first.draft.should == @drafts[0]
+    end
+
+    it "should not include incorrect associations" do
+      Player.first.draft.should_not == @drafts[1]
+    end
+  end
+
+  describe "create with has-many association", :given => "three teams exist" do
     before(:each) do
       @response = request(url(:admin_create, :model_name => "league"), :method => "post", :params => {:league => {:name => "National League"}, :associations => {:teams => [@teams[0].id, @teams[1].id]}})
     end
@@ -424,6 +476,24 @@ describe "MerbAdmin" do
     end
   end
 
+  describe "update with has-one association", :given => "a player exists and two drafts exist" do
+    before(:each) do
+      @response = request(url(:admin_update, :model_name => "player", :id => @player.id), :method => "put", :params => {:player => {:name => "Jackie Robinson", :number => 42, :team_id => 1, :position => :second, :sex => :male}, :associations => {:draft => @drafts[0].id}})
+    end
+
+    it "should update an object that already exists" do
+      Player.first(:id => @player.id).name.should eql("Jackie Robinson")
+    end
+
+    it "should include correct associations" do
+      Player.first.draft.should == @drafts[0]
+    end
+
+    it "should not include incorrect associations" do
+      Player.first.draft.should_not == @drafts[1]
+    end
+  end
+
   describe "update with has-many association", :given => "a league exists and three teams exist" do
     before(:each) do
       @response = request(url(:admin_update, :model_name => "league", :id => @league.id), :method => "put", :params => {:league => {:name => "National League"}, :associations => {:teams => [@teams[0].id, @teams[1].id]}})

data/spec/spec_helper.rb

@@ -4,7 +4,17 @@ require 'merb-slices'
 require 'merb-helpers'
 require 'merb-assets'
 require 'spec'
-require 'spec/fixtures'
+
+# Required for fixtures
+require 'dm-sweatshop'
+require 'dm-types'
+require 'dm-aggregates'
+require 'dm-validations'
+require 'dm-is-paginated'
+
+Dir[File.join(File.dirname(__FILE__), 'fixtures', '**', '*_fixture.rb').to_s].each do |fixture_file|
+  require fixture_file
+end
 
 # Add merb-admin.rb to the search path
 Merb::Plugins.config[:merb_slices][:auto_register] = true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sferik-merb-admin
 version: !ruby/object:Gem::Version 
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors: 
 - Erik Michaels-Ober
@@ -72,7 +72,6 @@ files:
 - spec/fixtures/league_fixture.rb
 - spec/fixtures/player_fixture.rb
 - spec/fixtures/team_fixture.rb
-- spec/fixtures.rb
 - spec/requests
 - spec/requests/main_spec.rb
 - spec/spec_helper.rb
@@ -184,7 +183,6 @@ files:
 - public/stylesheets/widgets.css
 has_rdoc: false
 homepage: http://twitter.com/sferik
-licenses: 
 post_install_message: |
   ********************************************************************************
   
@@ -212,7 +210,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: merb
-rubygems_version: 1.3.5
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 3
 summary: MerbAdmin is a Merb plugin that provides an easy-to-use interface for managing your data.

data/spec/fixtures.rb

@@ -1,11 +0,0 @@
-# Learn more at http://github.com/datamapper/dm-more/tree/master/dm-sweatshop
-require 'dm-sweatshop'
-# Learn more at http://github.com/datamapper/dm-more/tree/master/dm-types
-require 'dm-types'
-require 'dm-aggregates'
-require 'dm-validations'
-require 'dm-is-paginated'
-
-Dir['spec/fixtures/**/*_fixture.rb'].sort.each do |fixture_file|
-  require fixture_file
-end