controller_scaffolding 1.0.4 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ce0c5472647af7643c8d093ba2022f779c34f3b
-  data.tar.gz: 444dbed8858978aad01a3b20d2d958b74abf7cf0
+  metadata.gz: 4d15324bcb4113f23fcdb1d8511c62391ea5acde
+  data.tar.gz: 5fb7433753516ace78210991a5a6d1b931a88716
 SHA512:
-  metadata.gz: f37f7db035f31330dd471d69e68f8a60e52d714d60ebed1586f2f548fa6a38ae3874e1163d4762dabd3d0d070baea3c0c8eeaf13ed89d398f56c8cb242ef2b89
-  data.tar.gz: a29711151a8c3d127aa70294a14529e017f6bc1c5a1f850bb2b44278a21cb36a7a732fc9804699c32558dc7f872f9acb152411a4482eccc3073ac3e5048b8126
+  metadata.gz: 729298a36cf88deb7f9c18e336985612d5178615de50537af795e2b140e62fdb0c37f042b5ce0454980a38c54c84bb1f255e8120139db4f20518a8281c32b7b7
+  data.tar.gz: 083dec941527e785d4a70233bf350d9eccdc071317988281d7ef81027eb04ef8f4eaf32c5270058d2f9d4073116bda90195cade8ae7fd081514825640b0f83d2

data/README.md

@@ -7,6 +7,9 @@ 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")
 ---
@@ -22,7 +25,7 @@ and then run `bundle install`
 #### Usage ####
 ```bash
 $ rails g|d controller_scaffolding users index new create edit update destroy --template-engine=haml
-[--skip-ext-index-nav] [--skip-ext-form-submit] [--skip-assets] [--skip-test-framework] [--skip-helper] [--quiet] [--force] [---skip-search-sort]
+[--skip-ext-index-nav] [--skip-ext-form-submit] [--skip-assets] [--skip-test-framework] [--skip-helper] [--quiet] [--force] [--skip-search-sort]
 ```
 
 *Note: You must restart Rails after running this generator*
@@ -42,7 +45,7 @@ $ rails g|d controller_scaffolding users index new create edit update destroy --
 | --skip-helper          | Do not create helper file                              | yes        |
 | --quiet                | Suppress info messages                                 | yes        |
 | --force                | Overwrite files without prompting                      | yes        |
-| --skip-search-sort     | Do not include search or sort fucntionality            | yes        |
+| --skip-search-sort     | Do not include search or sort functionality            | yes        |
 
 ### Description of generator actions ###
 	
@@ -87,6 +90,10 @@ $ rails g|d controller_scaffolding users index new create edit update destroy --
 #### Search and Sort ####
 * see README.md at https://github.com/jomalley2112/sql_search_n_sort
 
+### Testing ###
+* Generator tests: run `rake test` from the root directory.
+* Integration test specs: run `rspec spec` from 'test/dummy'  
+
 ### Gem dependencies ###
 #### Dependencies ####
 - 'rails', '~> 4.1'
@@ -105,6 +112,8 @@ $ rails g|d controller_scaffolding users index new create edit update destroy --
 - "database_cleaner"
 
 #### TODO ####
+- See if we can support case where existing model has been removed after generator has been run and then the user decides to uninstall (revoke) controller_scaffolding.
 - Do something with template engine hook so Haml doesn't need to be specified in the generator call
 - Add search results message like "9 Results match 'you search string'"
+- Nail down versions for dependencies
 

data/lib/controller_scaffolding/version.rb

@@ -1,3 +1,3 @@
 module ControllerScaffolding
-  VERSION = "1.0.4"
+  VERSION = "1.1.0"
 end

data/lib/generators/controller/controller_scaffolding_generator.rb

@@ -1,7 +1,9 @@
 #CONTROLLER GENERATOR
+#To Teardown manually:
+# rails d controller_scaffolding people index new create edit update destroy custom_action --template-engine=haml
 
 require 'rails/generators/generated_attribute'
-#require 'pry-rails'
+
 
 module Rails
   module Generators
@@ -49,12 +51,12 @@ module Rails
         @actions = actions.nil? || actions.empty? ? %w(index new create edit update destroy) : actions
       end
 
-      def check_for_model
+      def check_for_model #TODO: only do if behavior = :invoke maybe?
         begin
         table_name.classify.constantize #throws runtime if model doesn't exist
         rescue
           raise Thor::Error, 
-            "Cannot run controller scaffold for model (#{table_name}) that doesn't yet exist."
+            "Cannot run controller scaffold for model (#{table_name.constantize}) that doesn't yet exist."
         end
       end
 

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

@@ -1,5 +1,8 @@
 #TEMPLATE GENERATOR & FILE COPIER
 
+#To Teardown manually:
+# rails d controller_scaffolding people index new create edit update destroy custom_action --template-engine=haml
+
 require 'rails/generators/erb/controller/controller_generator'
 require 'rails/generators/erb/scaffold/scaffold_generator'
 
@@ -148,23 +151,27 @@ module Haml
       end
 
       def add_pagination_to_locale_file
-        inject_into_file "config/locales/en.yml", 
-          after: "\nen:\n" do
-%Q{\n
-  will_paginate:
-    models:
-      people:
-        zero:  People
-        one:   Person
-        other: People
-    page_entries_info:
-      multi_page_html: "Displaying <b>%{from}&nbsp;-&nbsp;%{to}</b> of <b>%{count}</b> %{model}"
-      single_page_html:
-        zero:  "No %{model} found"
-        one:   "Displaying <b>1</b> %{model}"
-        other: "Displaying <b>all&nbsp;%{count}</b> %{model}"
-}
-          end
+        #TODO: Could put some kind of logic in here when revoking that removes some lines
+        # from the locale file, but it shouldn't hurt anything if we don't
+        lang = I18n.locale.to_s
+        locale_config = YAML.load_file("#{destination_root}/config/locales/#{lang}.yml")
+        locale_config[I18n.locale.to_s] = {} unless locale_config[lang]
+        lc_wp = locale_config[I18n.locale.to_s]['will_paginate'] ||=
+          locale_config[I18n.locale.to_s]['will_paginate'] = {}
+        wp_models = lc_wp['models'] || lc_wp['models'] = {}
+        curr_model = wp_models[table_name] || 
+          wp_models[table_name] = { "zero"=>table_name.humanize, 
+                                    "one"=>file_name.singularize.humanize, 
+                                    "other"=>table_name.humanize }
+        wp_pei = lc_wp['page_entries_info'] || lc_wp['page_entries_info'] = {}
+        pei_mph = wp_pei['multi_page_html'] || wp_pei['multi_page_html'] = 
+          "Displaying <b>%{from}&nbsp;-&nbsp;%{to}</b> of <b>%{count}</b> %{model}"
+
+        pei_sph = wp_pei['single_page_html'] || wp_pei['single_page_html'] = {}
+        pei_sph['zero'] || pei_sph['zero'] = "No %{model} found"
+        pei_sph['one'] || pei_sph['one'] = "Displaying <b>1</b> %{model}"
+        pei_sph['other'] || pei_sph['other'] = "Displaying <b>all&nbsp;%{count}</b> %{model}"
+        File.open("#{destination_root}/config/locales/#{lang}.yml", "w") { |f| YAML.dump(locale_config, f) }
       end
 
       def file_action(path)

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

@@ -0,0 +1,2 @@
+class Dinosaur < ActiveRecord::Base
+end

data/test/dummy/config/locales/en.yml

@@ -1,25 +1,19 @@
-# Files in the config/locales directory are used for internationalization
-# and are automatically loaded by Rails. If you want to use locales other
-# than English, add the necessary files in this directory.
-#
-# To use the locales, use `I18n.t`:
-#
-#     I18n.t 'hello'
-#
-# In views, this is aliased to just `t`:
-#
-#     <%= t('hello') %>
-#
-# To use a different locale, set it with `I18n.locale`:
-#
-#     I18n.locale = :es
-#
-# This would use the information in config/locales/es.yml.
-#
-# To learn more, please read the Rails Internationalization guide
-# available at http://guides.rubyonrails.org/i18n.html.
-
+---
 en:
-
-  
-
+  will_paginate:
+    models:
+      people:
+        zero: People
+        one: Person
+        other: People
+      credit_card_infos:
+        zero: Credit card infos
+        one: Credit card info
+        other: Credit card infos
+    page_entries_info:
+      multi_page_html: Displaying <b>%{from}&nbsp;-&nbsp;%{to}</b> of <b>%{count}</b>
+        %{model}
+      single_page_html:
+        zero: No %{model} found
+        one: Displaying <b>1</b> %{model}
+        other: Displaying <b>all&nbsp;%{count}</b> %{model}

data/test/dummy/db/migrate/20140806202909_create_dinosaurs.rb

@@ -0,0 +1,11 @@
+class CreateDinosaurs < ActiveRecord::Migration
+  def change
+    create_table :dinosaurs do |t|
+      t.string :name
+      t.string :age
+      t.boolean :good_dino
+
+      t.timestamps
+    end
+  end
+end

data/test/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20140731014857) do
+ActiveRecord::Schema.define(version: 20140806202909) do
 
   create_table "credit_card_infos", force: true do |t|
     t.string   "cardholder"
@@ -21,6 +21,14 @@ ActiveRecord::Schema.define(version: 20140731014857) do
     t.datetime "updated_at"
   end
 
+  create_table "dinosaurs", force: true do |t|
+    t.string   "name"
+    t.string   "age"
+    t.boolean  "good_dino"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
   create_table "people", force: true do |t|
     t.string   "first_name"
     t.string   "last_name"