controller_scaffolding 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8365f50379af89a274eb1e6461c0e9d0c1f584da
-  data.tar.gz: ad8e187905f697a1ac3776054546901f802b1163
+  metadata.gz: e8ddc14b49898c2f28ac9099b247497f75b8cf69
+  data.tar.gz: 83f2105e1597867a97c840103d2e94b8fbb66fb7
 SHA512:
-  metadata.gz: 684d37c11712a4760ff69a46a3421b000bd910074d6966ba15f884c70c294151205f642ee011e34180b56b1909c77a2bec10367da95fc3b9155822e133c94e27
-  data.tar.gz: e98e2da6e2018c308b09eee35e9bc3a24d209b277a6f1d8976f80b60fc29036b453068ce5a7c39067c94ca8bb59a1054090b21a0d385512ad410e7c46b157630
+  metadata.gz: 4d035109c9323eddc7d481650cf633affdff5007fa97d228b992403f907427c045cbfb09e473daadcbf1bc94c319a2639176be22bd66815f312bc07f76a88a68
+  data.tar.gz: 42543180b4eeba24dfdf86b5d3a37753b85a84e2d7beb7042b699cba0b2d0d7fc1a18e329b688151808c688394268d784f7dba806bf0f97f3da41d27fb065473

data/README.md

@@ -7,8 +7,6 @@ The generator acts somewhat like scaffolding, but you must specify an *existing*
 
 \* https://github.com/jomalley2112/sql_search_n_sort
 
-#### Current Issues ####
-* made 2 intermittently failing specs in people_spec pending
 
 #### Index page ####
 ![Index](/readme_assets/index_ss.png?raw=true "Index")
@@ -23,8 +21,13 @@ and then run `bundle install`
 
 
 #### Usage ####
+Real Example:
 ```bash
-$ rails g|d controller_scaffolding users index new create edit update destroy --template-engine=haml
+$ rails g controller_scaffolding users index new create edit update destroy --template-engine=haml --skip-assets --skip-test-framework --skip-helper
+```
+All Options:
+```bash
+$ rails g|d controller_scaffolding plural_model_name action1 action2 action3 --template-engine=haml
 [--skip-ext-index-nav] [--skip-ext-form-submit] [--skip-assets] [--skip-test-framework] [--skip-helper] [--quiet] [--force] [--skip-search-sort]
 ```
 
@@ -101,7 +104,7 @@ $ rails g|d controller_scaffolding users index new create edit update destroy --
 - 'haml-rails'
 - 'sass-rails', '~> 4.0.3'
 - 'jquery-rails'
-- 'sql_search_n_sort', '=1.15'
+- 'sql_search_n_sort', '=2.0.0'
 
 #### Development Environment Dependencies ####
 - "sqlite3"

data/lib/controller_scaffolding/version.rb

@@ -1,3 +1,3 @@
 module ControllerScaffolding
-  VERSION = "1.1.1"
+  VERSION = "1.2.0"
 end

data/lib/generators/haml/controller/controller_scaffolding_generator.rb

@@ -95,9 +95,10 @@ module Haml
             before: /^end/ do
               "\n\textend SqlSearchableSortable\n"
             end
+          #binding.pry
           inject_into_file "app/models/#{table_name.singularize}.rb",
             before: /^end/ do
-              "\n\tsql_searchable #{cols_to_symbols}\n" 
+              "\n\tsql_searchable #{searchable_cols_as_symbols}\n" 
             end
           inject_into_file "app/models/#{table_name.singularize}.rb",
             before: /^end/ do
@@ -116,7 +117,15 @@ module Haml
 #================================= P R I V A T E =====================================
       private
 
+      def searchable_cols_as_symbols
+        puts "!!!="+@attr_cols.select{ |col| [:string, :text].include? col.type}
+          .map { |col| col.name.to_sym }.to_s.gsub(/\[(.*)\]/, '\1')
+        @attr_cols.select{ |col| [:string, :text].include? col.type}
+          .map { |col| col.name.to_sym }.to_s.gsub(/\[(.*)\]/, '\1')
+      end
+
       def cols_to_symbols
+
         #ugly, but I can't find another way to keep the symbols
         @attr_cols.map { |col| col.name.to_sym }.to_s.gsub(/\[(.*)\]/, '\1')
       end

data/test/dummy/app/models/credit_card_info.rb

@@ -1,3 +1,3 @@
-class CreditCardInfo < ActiveRecord::Base
-	
+class CreditCardInfo < ActiveRecord::Base	
+
 end

data/test/dummy/log/development.log

@@ -14477,3 +14477,5 @@ Started GET "/assets/application.css?body=1" for 127.0.0.1 at 2014-08-21 11:49:4
 
 
 Started GET "/assets/application.css?body=1" for 127.0.0.1 at 2014-08-21 11:50:29 -0400
+  Person Load (0.3ms)  SELECT  "people".* FROM "people"   ORDER BY "people"."id" ASC LIMIT 1
+  Person Load (1.2ms)  SELECT "people".* FROM "people"