toy-locomotive 0.0.9 → 0.0.10

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    toy-locomotive (0.0.4)
+    toy-locomotive (0.0.9)
       rails
 
 GEM
@@ -46,7 +46,7 @@ GEM
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.18)
+    mime-types (1.19)
     multi_json (1.3.4)
     polyglot (0.3.3)
     rack (1.4.1)

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

@@ -1,7 +1,7 @@
 module ToyLocomotive::Attributes
   class AttributeChain
 
-    attr_accessor :column, :parent, :_as, :_helper
+    attr_accessor :column, :parent, :_as, :_helper, :_options
 
     def initialize column, parent
       @column = column
@@ -15,6 +15,11 @@ module ToyLocomotive::Attributes
       self
     end
 
+    def options *args
+      @_options = (args.any? && args.first.is_a?(Array)) ? args.first : args
+      self
+    end
+
     def presence bool
       parent.send :validates_presence_of, column
       self

data/lib/toy-locomotive/auto_views/form.rb

@@ -1,5 +1,9 @@
 module ToyLocomotive::AutoViews
   def auto_form_for args
+    if block_given?
+      form = ToyLocomotive::AutoViews::AutoForm.new
+      yield(form)
+    end
     form_for args do |f|
       arg = args.class == Array ? args.last : args
       klass = arg.class
@@ -13,6 +17,9 @@ module ToyLocomotive::AutoViews
           if attr.to_helper == :check_box
             html += f.send attr.to_helper, attr.to_table_column
             html += f.label attr.to_table_column
+          elsif attr.to_helper == :select
+            html += f.label attr.to_table_column
+            html += f.send attr.to_helper, attr.to_table_column, attr._options
           else
             html += f.label attr.to_table_column
             html += f.send attr.to_helper, attr.to_table_column
@@ -21,6 +28,9 @@ module ToyLocomotive::AutoViews
         end
       end
       html += '<div class="actions">'
+      puts "+++++++++++++++++++"
+      puts form._actions if block_given?
+      puts "+++++++++++++++++++"
       html += f.submit
       html += link_to "Cancel", root_path
       html += '</div>'
@@ -29,4 +39,16 @@ module ToyLocomotive::AutoViews
   end
 end
 
+class ToyLocomotive::AutoViews::AutoForm
+  attr_accessor :_actions
+
+  def actions &blk
+    @_actions = blk
+  end
+
+  def _actions
+    @_actions.call.to_s
+  end
+end
+
 ActionView::Base.send :include, ToyLocomotive::AutoViews

data/lib/toy-locomotive/initializer.rb

@@ -1,16 +1,19 @@
 module ToyLocomotive
   class Engine < Rails::Engine
-    initializer 'toy_locomotive.initialize', :after=> :disable_dependency_loading do |app|
+    initializer 'toy_locomotive.initialize', :after => :disable_dependency_loading do |app|
       Dir["#{Rails.root}/app/models/*.rb"].each do |file|
         require file
         AttributeObserver.new file.split('/').last.split('.').first.classify.constantize
       end
+      controllers = []
       Dir["#{Rails.root}/app/controllers/*.rb"].each do |file|
         require file
-        const = file.split('/').last.split('.').first.classify.constantize.append_filters!
+        controllers << file.split('/').last.split('.').first.classify.constantize
+        controllers.last.append_filters!
       end
       Rails.application.class.routes.draw do
         ToyLocomotive.routes.each {|route| match route[:path] => "#{route[:controller]}##{route[:action]}", as: route[:as], via: route[:method]}
+      #  controllers.each {|controller| controller._route.call if controller._route}
       end
     end
   end

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

@@ -0,0 +1,11 @@
+module ToyLocomotive::Router::Block
+
+  mattr_accessor :_route
+
+  def route &block
+    @_route = &block
+  end
+
+end
+
+ActionController::Base.extend ToyLocomotive::Router::Block

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

@@ -91,7 +91,7 @@ module ToyLocomotive::Router::Controller
   module InstanceMethods
 
     def extract_parent_vars
-      chain = self.class.belongs_chain.clone
+      chain = self.class.belongs_chain.reverse.clone
       vars = []
       if chain.any?
         root = chain.pop
@@ -108,14 +108,14 @@ module ToyLocomotive::Router::Controller
     end
 
     def extract_member_var
-      parent = self.class.belongs_chain.reverse.pop
+      parent = self.class.belongs_chain.pop#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 = self.class.belongs_chain.reverse.pop
+      parent = self.class.belongs_chain.pop#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))

data/lib/toy-locomotive/version.rb

@@ -1,3 +1,3 @@
 module ToyLocomotive
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: toy-locomotive
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-18 00:00:00.000000000 Z
+date: 2012-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &26191956 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *26191956
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &26191272 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *26191272
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &26190720 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *26190720
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &26189784 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +69,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *26189784
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: a Different aproach to Rails applications
 email:
 - mortaro@towsta.com
@@ -74,6 +94,7 @@ files:
 - lib/toy-locomotive/auto_views/show.rb
 - lib/toy-locomotive/initializer.rb
 - lib/toy-locomotive/resources/controller.rb
+- lib/toy-locomotive/router/block.rb
 - lib/toy-locomotive/router/controller.rb
 - lib/toy-locomotive/router/model.rb
 - lib/toy-locomotive/version.rb
@@ -110,7 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: toy-locomotive
-rubygems_version: 1.8.16
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: a Toy Locomotive to run over Rails