toy-locomotive 0.0.6 → 0.0.7

data/lib/toy-locomotive/attributes/model.rb

@@ -14,6 +14,10 @@ module ToyLocomotive::Attributes::Model
       toy_attributes.select{|a| a.parent == self}
     end
 
+    def use_toy_attributes?
+      true
+    end
+
   end
 end
 ActiveRecord::Base.extend ToyLocomotive::Attributes::Model::ClassMethods

data/lib/toy-locomotive/attributes/observer.rb

@@ -4,6 +4,7 @@ module ToyLocomotive
     attr_accessor :attribute
 
     def initialize model
+      return unless model.respond_to?(:use_toy_attributes?) && model.use_toy_attributes?
       @model = model
       unless ActiveRecord::Base.connection.table_exists? @model.table_name
         Class.new(ActiveRecord::Migration).create_table(@model.table_name.to_sym) do |t|
@@ -13,6 +14,7 @@ module ToyLocomotive
       @model.attributes.each do |attribute|
         set_attribute(attribute)
         @model.attr_accessible attribute.column
+        @model.attr_accessible :"#{attribute.column}_id" if attribute._as == :belongs_to
       end
       @model.reset_column_information
     end

data/lib/toy-locomotive/resources/controller.rb

@@ -14,8 +14,8 @@ module ToyLocomotive::Resources::Controller
 
     def set_action_new
       get 'new' do
-        extract_parent_vars
-        parent = instance_variable_get (model = self.class.extract_model).belongs_chain.reverse.pop.to_member_var
+        parent = extract_parent_vars.last
+        model = self.class.extract_model
         instance_variable_set model.to_member_var, (parent ? parent.send(model.to_s.underscore.pluralize) : model).new
       end
     end
@@ -43,8 +43,8 @@ module ToyLocomotive::Resources::Controller
 
     def set_action_create
       post 'create' do
-        vars = extract_parent_vars
-        parent = instance_variable_get (model = self.class.extract_model).belongs_chain.reverse.pop.to_member_var
+        parent = (vars = extract_parent_vars).last
+        model = self.class.extract_model
         member = (parent ? parent.send(model.to_s.underscore.pluralize) : model).new(params[model.to_s.underscore.to_sym])
         instance_variable_set model.to_member_var, member
         vars = vars << member

data/lib/toy-locomotive/router/controller.rb

@@ -4,6 +4,22 @@ module ToyLocomotive::Router::Controller
 
     %w(get put post delete).each {|via| eval "def #{via} path, opts={}, &blk; match_action \"#{via}\", path, opts, blk; end"}
 
+    def nested *args
+      @_nested = *args
+    end
+
+    def belongs_chain
+      (@_nested || []).map{|m| m.to_s.classify.constantize}
+    end
+
+    def route_chain
+      belongs_chain.map{|m| m.to_route}.join
+    end
+
+    def route_as
+      belongs_chain.map{|m| m.to_s.underscore }.join('_') << (belongs_chain.empty? ? extract_model.to_s.underscore : "_#{extract_model.to_s.underscore}")
+    end
+
     def match_action method, path, opts, blk
       action = extract_action path, opts, method
       extract_filter action, path, opts, method
@@ -32,18 +48,18 @@ module ToyLocomotive::Router::Controller
 
     def extract_path path, opts={}
       return path if path[0] == '/'
-      return "#{extract_model.route_chain}#{extract_model.to_route}/#{path.parameterize}" if opts[:on] == 'member' || path == 'edit'
-      return "#{extract_model.route_chain}#{extract_model.to_route}" if ['show','update','destroy'].include?(path)
-      return "#{extract_model.route_chain}/#{extract_model.to_s.underscore.pluralize}" if ['create', 'index'].include?(path)
-      "#{extract_model.route_chain}/#{extract_model.to_s.underscore.pluralize}/#{path.parameterize}"
+      return "#{route_chain}#{extract_model.to_route}/#{path.parameterize}" if opts[:on] == 'member' || path == 'edit'
+      return "#{route_chain}#{extract_model.to_route}" if ['show','update','destroy'].include?(path)
+      return "#{route_chain}/#{extract_model.to_s.underscore.pluralize}" if ['create', 'index'].include?(path)
+      "#{route_chain}/#{extract_model.to_s.underscore.pluralize}/#{path.parameterize}"
     end
 
     def extract_as path, opts={}, method='get'
-      return extract_model.to_as.pluralize if path == 'index'
-      return extract_model.to_as if path == 'show'
+      return route_as.pluralize if path == 'index'
+      return route_as if path == 'show'
       return nil if method != 'get'
       action = extract_action path, opts
-      path[0] == '/' ? action : "#{action}_#{extract_model.to_as}"
+      path[0] == '/' ? action : "#{action}_#{route_as}"
     end
 
     def extract_action path, opts={}, method='get'
@@ -75,14 +91,14 @@ module ToyLocomotive::Router::Controller
   module InstanceMethods
 
     def extract_parent_vars
-      chain = self.class.extract_model.belongs_chain
+      chain = self.class.belongs_chain.clone
       vars = []
       if chain.any?
         root = chain.pop
         parent = root.find(params[root.to_params])
         instance_variable_set root.to_member_var, parent
         vars << parent
-        chain.reverse!.each do |model|
+        chain.each do |model|
           parent = parent.send(model.to_s.underscore.pluralize).find(params[model.to_params])
           instance_variable_set model.to_member_var, parent
           vars << parent
@@ -92,13 +108,15 @@ module ToyLocomotive::Router::Controller
     end
 
     def extract_member_var
-      parent = (model = self.class.extract_model).belongs_chain.reverse.pop
+      parent = self.class.belongs_chain.reverse.pop
+      model = self.class.extract_model
       parent = parent ? instance_variable_get(parent.to_member_var) : nil
       instance_variable_set(model.to_member_var, (parent ? parent.send(model.to_s.underscore.pluralize) : model).find(params[model.to_params]))
     end
 
     def extract_collection_var
-      parent = (model = self.class.extract_model).belongs_chain.reverse.pop
+      parent = self.class.belongs_chain.reverse.pop
+      model = self.class.extract_model
       parent = parent ? instance_variable_get(parent.to_member_var) : nil
       instance_variable_set(model.to_collection_var, (parent ? parent.send(model.to_s.underscore.pluralize) : model.all))
     end

data/lib/toy-locomotive/router/model.rb

@@ -1,18 +1,18 @@
 module ToyLocomotive::Router::Model
 
-  def belongs_to_route
-    reflections = reflect_on_all_associations(:belongs_to)
-    reflections.any? ? reflections.first.name.to_s.camelize.constantize : nil
-  end
+  #def belongs_to_route
+  #  reflections = reflect_on_all_associations(:belongs_to)
+  #  reflections.any? ? reflections.first.name.to_s.camelize.constantize : nil
+  #end
 
-  def belongs_chain chain=[]
-    parent_route = (chain.last || self).belongs_to_route
-    parent_route ? belongs_chain(chain << parent_route) : chain
-  end
+  #def belongs_chain chain=[]
+  #  parent_route = (chain.last || self).belongs_to_route
+  #  parent_route ? belongs_chain(chain << parent_route) : chain
+  #end
 
-  def route_chain
-    belongs_chain.reverse.map{|m| m.to_route}.join
-  end
+  #def route_chain
+  #  belongs_chain.reverse.map{|m| m.to_route}.join
+  #end
 
   def to_route
     s = to_s.parameterize.downcase
@@ -31,9 +31,9 @@ module ToyLocomotive::Router::Model
     :"#{to_s.underscore}_id"
   end
 
-  def to_as
-    belongs_chain.reverse!.map{|m| m.to_s.underscore }.join('_') << (belongs_chain.empty? ? to_s.underscore : "_#{to_s.underscore}")
-  end
+  #def to_as
+  #  belongs_chain.reverse!.map{|m| m.to_s.underscore }.join('_') << (belongs_chain.empty? ? to_s.underscore : "_#{to_s.underscore}")
+  #end
 
 end
 

data/lib/toy-locomotive/version.rb

@@ -1,3 +1,3 @@
 module ToyLocomotive
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: toy-locomotive
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-08 00:00:00.000000000 Z
+date: 2012-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &26057412 !ruby/object:Gem::Requirement
+  requirement: &27219312 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *26057412
+  version_requirements: *27219312
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &26056980 !ruby/object:Gem::Requirement
+  requirement: &27218736 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *26056980
+  version_requirements: *27218736
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &26055636 !ruby/object:Gem::Requirement
+  requirement: &27218244 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *26055636
+  version_requirements: *27218244
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &26054808 !ruby/object:Gem::Requirement
+  requirement: &27217476 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *26054808
+  version_requirements: *27217476
 description: a Different aproach to Rails applications
 email:
 - mortaro@towsta.com