inline_forms 0.8.2 → 0.8.3

data/VERSION

@@ -1 +1 @@
-0.8.2
+0.8.3

data/app/controllers/inline_forms_controller.rb

@@ -33,7 +33,7 @@ class InlineFormsController < ApplicationController
     update_span = params[:update]
     respond_to do |format|
       # found this here: http://www.ruby-forum.com/topic/211467
-      format.html { render 'inline_forms/index', :layout => 'inline_forms' }
+      format.html { render 'inline_forms/index', :layout => 'inline_forms' } unless @Klass.not_accessible_through_html?
       format.js { render(:update) {|page| page.replace_html update_span, :partial => 'inline_forms/index' } }
     end
   end

data/app/helpers/inline_forms_helper.rb

@@ -42,7 +42,8 @@ module InlineFormsHelper
   #
   def inline_forms_new_record(object, attributes=nil)
     attributes ||= object.inline_forms_attribute_list
-    out = String.new 
+    out = String.new
+    logger.info attributes.inspect
     attributes.each do | attribute, name, form_element |
       if not form_element.to_sym == :associated
         css_class_id = "attribute_#{attribute}_#{object.id}"
@@ -61,6 +62,7 @@ module InlineFormsHelper
         out += content_tag :tr, name_cell + value_cell
       end
     end
+    logger.info "return"
     return content_tag :table, raw(out), :cellspacing => 0, :cellpadding => 0
   end
 

data/inline_forms.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{inline_forms}
-  s.version = "0.8.2"
+  s.version = "0.8.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ace Suares"]
-  s.date = %q{2011-03-13}
+  s.date = %q{2011-03-16}
   s.description = %q{Inline Forms aims to ease the setup of forms that provide inline editing. The field list can be specified in the model.}
   s.email = %q{ace@suares.an}
   s.extra_rdoc_files = [

data/lib/generators/inline_forms/inline_forms_generator.rb

@@ -51,15 +51,19 @@ module InlineForms
       end
 
       def migration?
-        not ( relation? ||
-              column_type == :no_migration ||
-              name == "_presentation" ||
-              name == "_order" )
+        not ( column_type == :no_migration  ||
+              name == "_presentation"       ||
+              name == "_order"              ||
+              name == "_enabled"            ||
+              name == "_id"                 ||
+              relation? )
       end
 
       def attribute?
-        not ( name == '_presentation' ||
-              name == '_order' ||
+        not ( name == '_presentation'       ||
+              name == '_order'              ||
+              name == '_enabled'            ||
+              name == "_id"                 ||
               relation? )
       end
 
@@ -72,112 +76,135 @@ module InlineForms
     def copy_stylesheet
       copy_file File.expand_path('../../../../public/stylesheets', __FILE__) + "/inline_forms.css", "public/stylesheets/inline_forms.css" unless File.exists?('public/stylesheets/inline_forms.css')
     end
+    
+    # using flags.
+    def set_some_flags
+      @flag_not_accessible_through_html   = true
+      @flag_create_migration              = true
+      @flag_create_model                  = true
+      @create_id                          = true
+      for attribute in attributes
+        @flag_not_accessible_through_html = false if attribute.name == '_enabled'
+        @flag_create_migration            = false if attribute.name == '_no_migration'
+        @flag_create_model                = false if attribute.name == '_no_model'
+        @create_id                        = false if attribute.name == "_id" && attribute.type == :false
+      end
+      @flag_create_controller             = @flag_create_model
+      @flag_create_resource_route         = @flag_create_model
+    end
 
     def generate_model
-      @belongs_to               = "\n"
-      @has_many                 = "\n"
-      @has_one                  = "\n"
-      @habtm                    = "\n"
-      @has_attached_files       = "\n"
-      @presentation             = "\n"
-      @order                    = "\n"
-      @inline_forms_attribute_list  = String.new
-
-      for attribute in attributes
-        if attribute.column_type  == :belongs_to # :drop_down, :references and :belongs_to all end up with the column_type :belongs_to
-          @belongs_to << '  belongs_to :'         + attribute.name + "\n"
-        end
-        if attribute.type         == :has_many ||
-           attribute.type         == :has_many_destroy
-          @has_many << '  has_many :'             + attribute.name
-          @has_many << ', :dependent => :destroy' if attribute.type == :has_many_destroy
-          @has_many << "\n"
-        end
-        if attribute.type         == :has_one
-          @has_one << '  has_one :'               + attribute.name + "\n"
-        end
-        if attribute.type         == :habtm ||
-           attribute.type         == :has_and_belongs_to_many ||
-           attribute.type         == :check_list
-          @habtm << '  has_and_belongs_to_many :' + attribute.name + "\n"
-        end
-        if attribute.type         == :image
-          @has_attached_files << "  has_attached_file :#{attribute.name},
-               :styles => { :medium => \"300x300>\", :thumb => \"100x100>\" }\n"
-        end
-        if attribute.name == '_presentation'
-          @presentation <<  "  def _presentation\n" +
-                            "    \"#{attribute.type.to_s}\"\n" +
-                            "  end\n" +
-                            "\n"
-        end
-        if attribute.name == '_order'
-          @order <<  "  def <=>(other)\n" +
-                            "    self.#{attribute.type} <=> other.#{attribute.type}\n" +
-                            "  end\n" +
-                            "\n"
+      if @flag_create_model
+        @belongs_to               = "\n"
+        @has_many                 = "\n"
+        @has_one                  = "\n"
+        @habtm                    = "\n"
+        @has_attached_files       = "\n"
+        @presentation             = "\n"
+        @order                    = "\n"
+        @inline_forms_attribute_list  = String.new
+
+        for attribute in attributes
+          if attribute.column_type  == :belongs_to # :drop_down, :references and :belongs_to all end up with the column_type :belongs_to
+            @belongs_to << '  belongs_to :'         + attribute.name + "\n"
+          end
+          if attribute.type         == :has_many ||
+             attribute.type         == :has_many_destroy
+            @has_many << '  has_many :'             + attribute.name
+            @has_many << ', :dependent => :destroy' if attribute.type == :has_many_destroy
+            @has_many << "\n"
+          end
+          if attribute.type         == :has_one
+            @has_one << '  has_one :'               + attribute.name + "\n"
+          end
+          if attribute.type         == :habtm ||
+             attribute.type         == :has_and_belongs_to_many ||
+             attribute.type         == :check_list
+            @habtm << '  has_and_belongs_to_many :' + attribute.name + "\n"
+          end
+          if attribute.type         == :image
+            @has_attached_files << "  has_attached_file :#{attribute.name},
+                 :styles => { :medium => \"300x300>\", :thumb => \"100x100>\" }\n"
+          end
+          if attribute.name == '_presentation'
+            @presentation <<  "  def _presentation\n" +
+                              "    \"#{attribute.type.to_s}\"\n" +
+                              "  end\n" +
+                              "\n"
+          end
+          if attribute.name == '_order'
+            @order <<  "  def <=>(other)\n" +
+                              "    self.#{attribute.type} <=> other.#{attribute.type}\n" +
+                              "  end\n" +
+                              "\n"
+          end
+          if attribute.attribute?
+            attribute.attribute_type == :unknown ? commenter = '#' : commenter = ' '
+            @inline_forms_attribute_list << commenter +
+                                        '     [ :' +
+                                        attribute.name +
+                                        ' , "' + attribute.name +
+                                        '", :' + attribute.attribute_type.to_s +
+                                        " ], \n"
+          end
         end
-        if attribute.attribute?
-          attribute.attribute_type == :unknown ? commenter = '#' : commenter = ' '
-          @inline_forms_attribute_list << commenter +
-                                      '     [ :' +
-                                      attribute.name +
-                                      ' , "' + attribute.name +
-                                      '", :' + attribute.attribute_type.to_s +
-                                      " ], \n"
+        unless @inline_forms_attribute_list.empty?
+          @inline_forms_attribute_list =  "\n" +
+                                      "  def inline_forms_attribute_list\n" +
+                                      "    [\n" +
+                                      @inline_forms_attribute_list +
+                                      "    ]\n" +
+                                      "  end\n" +
+                                      "\n"
         end
+        template "model.erb", "app/models/#{model_file_name}.rb"
       end
-      unless @inline_forms_attribute_list.empty?
-        @inline_forms_attribute_list =  "\n" +
-                                    "  def inline_forms_attribute_list\n" +
-                                    "    [\n" +
-                                    @inline_forms_attribute_list +
-                                    "    ]\n" +
-                                    "  end\n" +
-                                    "\n"
-      end
-      template "model.erb", "app/models/#{model_file_name}.rb"
-    end
-
-    def generate_controller
-      template "controller.erb", "app/controllers/#{controller_file_name}.rb"
     end
 
-    def generate_route
-      route "resources :#{resource_name}"
-    end
+    def generate_resource_route
+      route "resources :#{resource_name}" if @flag_create_resource_route
+    end 
 
     def generate_migration
-      @columns = String.new
-
-      for attribute in attributes
-        if attribute.column_type == :image
-          @columns << '      t.string    :' + attribute.name + "_file_name\n"
-          @columns << '        t.string    :' + attribute.name + "_content_type\n"
-          @columns << '        t.integer   :' + attribute.name + "_file_size\n"
-          @columns << '        t.datetime  :' + attribute.name + "_updated_at\n"
-        else
-          if attribute.migration?
-            attribute.attribute_type == :unknown ? commenter = '#' : commenter = ' '
-            @columns << commenter +
-                        '     t.' +
-                        attribute.column_type.to_s +
-                        " :" +
-                        attribute.name +
-                        " \n"
+      if @flag_create_migration
+        @columns = String.new
+
+        for attribute in attributes
+          if attribute.column_type == :image
+            @columns << '      t.string    :' + attribute.name + "_file_name\n"
+            @columns << '        t.string    :' + attribute.name + "_content_type\n"
+            @columns << '        t.integer   :' + attribute.name + "_file_size\n"
+            @columns << '        t.datetime  :' + attribute.name + "_updated_at\n"
+          else
+            if attribute.migration?
+              attribute.attribute_type == :unknown ? commenter = '#' : commenter = ' '
+              @columns << commenter +
+                          '     t.' +
+                          attribute.column_type.to_s +
+                          " :" +
+                          attribute.name +
+                          " \n"
+            end
           end
         end
+        template "migration.erb", "db/migrate/#{time_stamp}_inline_forms_create_#{table_name}.rb"
       end
-      template "migration.erb", "db/migrate/#{time_stamp}_inline_forms_create_#{table_name}.rb"
     end
 
     def add_tab
-      copy_file "_inline_forms_tabs.html.erb", "app/views/_inline_forms_tabs.html.erb" unless File.exists?('app/views/_inline_forms_tabs.html.erb')
-      inject_into_file "app/views/_inline_forms_tabs.html.erb",
-              "  <%= tab.#{name.underscore} '#{name}', #{name.pluralize.underscore + '_path'} %>\n",
-              :after => "<% tabs_tag :open_tabs => { :id => \"tabs\" } do |tab| %>\n"
+      unless @flag_not_accessible_through_html
+        copy_file "_inline_forms_tabs.html.erb", "app/views/_inline_forms_tabs.html.erb" unless File.exists?('app/views/_inline_forms_tabs.html.erb')
+        inject_into_file "app/views/_inline_forms_tabs.html.erb",
+                "  <%= tab.#{name.underscore} '#{name}', #{name.pluralize.underscore + '_path'} %>\n",
+                :after => "<% tabs_tag :open_tabs => { :id => \"tabs\" } do |tab| %>\n"
+      end
     end
 
+    def generate_controller
+      template "controller.erb", "app/controllers/#{controller_file_name}.rb" if @flag_create_controller
+    end 
+
+
     private
     def model_file_name
       name.underscore

data/lib/generators/inline_forms/templates/controller.erb

@@ -1,3 +1,3 @@
 class <%= controller_name -%> < InlineFormsController
-  set_tab :<%= name.underscore %>
+<%= "  set_tab :" + name.underscore + "\n" unless @flag_not_accessible_through_html -%>
 end

data/lib/generators/inline_forms/templates/migration.erb

@@ -1,7 +1,7 @@
 class InlineFormsCreate<%= table_name.camelize %> < ActiveRecord::Migration
 
   def self.up
-    create_table :<%= table_name %> do |t|
+    create_table :<%= table_name + ", :id => " + @create_id.to_s %> do |t|
 <%= @columns -%>
       t.timestamps
     end

data/lib/generators/inline_forms/templates/model.erb

@@ -11,4 +11,8 @@ class <%= name %> < ActiveRecord::Base
 <%= @inline_forms_attribute_list -%>
 <%= @order  if @order.length > 1 -%>
 
+  def self.not_accessible_through_html?
+    <%= @flag_not_accessible_through_html %>
+  end
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: inline_forms
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 57
   prerelease: false
   segments: 
   - 0
   - 8
-  - 2
-  version: 0.8.2
+  - 3
+  version: 0.8.3
 platform: ruby
 authors: 
 - Ace Suares
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-13 00:00:00 -04:00
+date: 2011-03-16 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency