settingson 1.2.3 → 1.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6fe0caf6d8d6ed272cbe66d2b7abf35a01bba4d6
-  data.tar.gz: f01a17198a3faae4721ea9d826bd89401f9badfa
+  metadata.gz: 395f1d5f90055b322bfedc82ae30207741f360f9
+  data.tar.gz: 4496d34d31a2414946a6d9a5bde35c921731aa7c
 SHA512:
-  metadata.gz: 138e45ed8347cbde1251efef6bb7dee52443e236c6ccaaca36f6c42908e1ab08622286c69289db9a041ae639d34df13aad602004ebf27670675c7244b0c0c342
-  data.tar.gz: 4fc0b4e9fdaf0dd3055e5c4046e60d3a287a2c8d2ee3b7ba8335363957a7dcbd06f60262ad4b85926b73eeadfbc84f196eadbef3ca14d4e0bc7f439e3b7783e0
+  metadata.gz: e1d6e10072d0e36f4348ee0d9c35b4db498460249f532711993d66a72196b7681331e8f9382152ac3209c10f5a7ae10c95ea1c19d0b6017c3ab67e96be640583
+  data.tar.gz: 013dad12556132fab80b89a89fe8dbfa79b8bb5d1fe358854059e5e3172f60c0340bf5dd974703fb1397a7250cf4df1efd91257726cc59b62cdc276930adb566

data/app/models/concerns/settingson/base.rb

@@ -19,18 +19,18 @@ module Settingson::Base
 
       @settingson = "#{@settingson}.#{$1}"
 
-      if record = self.class.find_by(name: @settingson) and args.first.nil?
+      if record = self.class.find_by(key: @settingson) and args.first.nil?
         record.destroy
       elsif record
         record.update(value: args.first.to_yaml)
       else
-        self.class.create(name: @settingson, value: args.first.to_yaml)
+        self.class.create(key: @settingson, value: args.first.to_yaml)
       end
 
     else # getter
 
       @settingson += ".#{symbol.to_s}"
-      if record = self.class.find_by(name: @settingson)
+      if record = self.class.find_by(key: @settingson)
         YAML.load(record.value)
       else
         self
@@ -50,15 +50,15 @@ module Settingson::Base
 
         @settingson = $1
 
-        if record = find_by(name: @settingson)
+        if record = find_by(key: @settingson)
           record.update(value: args.first.to_yaml)
         else
-          create(name: @settingson, value: args.first.to_yaml, settingson: @settingson)
+          create(key: @settingson, value: args.first.to_yaml, settingson: @settingson)
         end
 
       else # getter
 
-        if record = find_by(name: symbol.to_s)
+        if record = find_by(key: symbol.to_s)
           YAML.load record.value
         else
           new(settingson: symbol.to_s)

data/lib/generators/settingson/settingson_generator.rb

@@ -1,7 +1,35 @@
+require 'rails/generators/active_record'
 class SettingsonGenerator < Rails::Generators::NamedBase
-  desc "This generator creates a model and his migration"
-  def create_migration
-    generate(:model, "#{name.camelize} name:string value:text")
-    inject_into_class "app/models/#{name.downcase}.rb", name.camelize, "\tinclude Settingson::Base\n"
+  include Rails::Generators::Migration
+
+  source_root File.expand_path('../templates', __FILE__)
+
+  desc "This generator creates a model and its migration"
+  def settingson_migration
+    klass = name.camelize
+    say "Searching for #{klass.constantize.inspect}"
+    if Object.const_defined?(klass)
+
+      settingson_inject_lines(name)
+
+      if klass.constantize.column_names.include?('name')
+        migration_template 'migrations/rename_name_to_key_on_settings.rb', 'db/migrate/rename_name_to_key_on_settings.rb'
+      end
+
+    else
+      generate(:model, "#{klass} key:string value:text")
+      settingson_inject_lines(name)
+    end
+  end
+
+  def self.next_migration_number dirname
+    ActiveRecord::Generators::Base.next_migration_number dirname
+  end
+
+  private
+  def settingson_inject_lines(name)
+    if File.readlines("app/models/#{name.downcase}.rb").grep(/\A\s*include Settingson::Base\z/).blank?
+      inject_into_class "app/models/#{name.downcase}.rb", name.camelize, "\tinclude Settingson::Base\n"
+    end
   end
 end

data/lib/generators/settingson/templates/migrations/rename_name_to_key_on_settings.rb

@@ -0,0 +1,5 @@
+class RenameNameToKeyOnSettings < ActiveRecord::Migration
+  def change
+    rename_column :settings, :name, :key
+  end
+end

data/lib/settingson/version.rb

@@ -1,3 +1,3 @@
 module Settingson
-  VERSION = "1.2.3"
+  VERSION = "1.2.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: settingson
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.10
 platform: ruby
 authors:
 - dan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-04 00:00:00.000000000 Z
+date: 2014-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -52,6 +52,7 @@ files:
 - Rakefile
 - app/models/concerns/settingson/base.rb
 - lib/generators/settingson/settingson_generator.rb
+- lib/generators/settingson/templates/migrations/rename_name_to_key_on_settings.rb
 - lib/settingson.rb
 - lib/settingson/engine.rb
 - lib/settingson/store.rb