settr 0.1.1 → 0.1.2

data/app/controllers/settr/settings_controller.rb

@@ -62,7 +62,7 @@ class Settr::SettingsController < Settr::ApplicationController
   end
   
   def settings
-    @settings = Settr.all
+    @settings = Settr.alterable
     
     if request.post?
       params[:settr].each do |k, v|

data/app/helpers/settr/settings_helper.rb

@@ -10,5 +10,10 @@ class Settr
       options.update(html_options)
       link_to(body, url, options)
     end
+    
+    def hash_depth(hash)
+      hashes = hash.values.select{|h| h.is_a?(Hash)}
+      hashes.present? ? hashes.map{|h| hash_depth(h)}.max + 1 : 1
+    end
   end
 end

data/app/models/settr_setting.rb

@@ -1,6 +1,8 @@
 # encoding: utf-8
 class SettrSetting < ActiveRecord::Base
 
+  scope :alterable, where('alterable = ?', true)
+  
   def val
     case typ
       when 'boolean'

data/app/views/settr/settings/_setting.html.erb

@@ -25,14 +25,14 @@
               <option value="<%= option %>" <%= 'selected' if object.value == option %> ><%= t("settr.#{object.key}.#{option}") %></option>
             <% end %>
           </select>
-      <% end %>
+      <% end %> 
     </div>
   <% end %>
 <% else %>
   <%= content_tag "h#{level}" do %>
     <%= t("settr.#{key}._title") %>
   <% end if level > 0 %>
-  <% object.sort_by{|k, v| k}.each do |k, v| %>
+  <% object.sort_by{|x, y| "#{y.is_a?(Hash) ? hash_depth(y) : 0} #{x}"}.each do |k, v| %>
     <%= render :partial => 'setting', :locals => {:object => v, :level => level + 1, :key => "#{key}.#{k}"} %>
   <% end %>
   <div class="horizontal_line grey"></div>

data/lib/generators/settr/install_generator.rb

@@ -9,9 +9,8 @@ class Settr
         copy_file 'settr.rb', 'config/initializers/settr.rb'
       end
       
-      def copy_and_run_migration
+      def copy_migration
         run 'rake settr_engine:install:migrations'
-        run 'rake db:migrate'
       end
     end
   end

data/lib/settr.rb

@@ -20,7 +20,7 @@ class Settr
   cattr_accessor :form_class
   @@form_class
   
-  #links
+  # links
   cattr_accessor :link_class
   @@link_class
   
@@ -67,17 +67,19 @@ class Settr
     end
   end
 
-  def self.all
-    SettrSetting.all.inject({}) do |h, s|
-      kk = s.key.split(".")
-      hh = h
-      kk.each_with_index do |k, i|
-        hh[k] ||= (i == kk.count-1 ? s : {})
-        hh = hh[k]
+  [:all, :alterable].each do |method|
+    self.define_singleton_method(method) do
+      SettrSetting.send(method).inject({}) do |h, s|
+        kk = s.key.split(".")
+        hh = h
+        kk.each_with_index do |k, i|
+          hh[k] ||= (i == kk.count-1 ? s : {})
+          hh = hh[k]
+        end
+        h
       end
-      h
     end
-  end
+  end  
 end
 
 require 'settr/version'

data/lib/settr/version.rb

@@ -1,3 +1,3 @@
 class Settr
-  VERSION = "0.1.1"
-end
+  VERSION = "0.1.2"
+end

data/settr.gemspec

@@ -16,8 +16,8 @@ Gem::Specification.new do |s|
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
 
-  s.add_dependency 'rails', '~> 3.1'
-  s.add_dependency 'jquery-rails'
-  s.add_dependency 'sass-rails'
-  s.add_dependency 'simple_form', '~> 1.5'
+  s.add_dependency 'rails',        '> 3.1'
+  s.add_dependency 'jquery-rails', '> 1.0'
+  s.add_dependency 'sass-rails',   '> 3.1'
+  s.add_dependency 'simple_form',  '> 1.5'
 end

data/test/dummy/config/initializers/settr.rb

@@ -0,0 +1,8 @@
+Settr.setup do |config|
+  config.resources      = true
+  config.header_tag     = 'h1'
+  config.header_class   = 'my_header_class'
+  config.table_class    = 'my_table_class'
+  config.link_class     = 'my_link_class'
+  config.form_class     = 'my_form_class'
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: settr
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,52 +9,52 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-17 00:00:00.000000000 Z
+date: 2012-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70253602696460 !ruby/object:Gem::Requirement
+  requirement: &70363482946140 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>'
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70253602696460
+  version_requirements: *70363482946140
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &70253602695480 !ruby/object:Gem::Requirement
+  requirement: &70363482945640 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ! '>'
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70253602695480
+  version_requirements: *70363482945640
 - !ruby/object:Gem::Dependency
   name: sass-rails
-  requirement: &70253602693540 !ruby/object:Gem::Requirement
+  requirement: &70363482945180 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ! '>'
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70253602693540
+  version_requirements: *70363482945180
 - !ruby/object:Gem::Dependency
   name: simple_form
-  requirement: &70253602704940 !ruby/object:Gem::Requirement
+  requirement: &70363482944700 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>'
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :runtime
   prerelease: false
-  version_requirements: *70253602704940
+  version_requirements: *70363482944700
 description: Settr is a hierarchical key-value based storage for configuration settings
   in Rails apps
 email:
@@ -118,6 +118,7 @@ files:
 - test/dummy/config/initializers/mime_types.rb
 - test/dummy/config/initializers/secret_token.rb
 - test/dummy/config/initializers/session_store.rb
+- test/dummy/config/initializers/settr.rb
 - test/dummy/config/initializers/wrap_parameters.rb
 - test/dummy/config/locales/de.yml
 - test/dummy/config/locales/en.yml
@@ -162,7 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: settr
-rubygems_version: 1.8.15
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: hierarchical key-value based storage for configuration settings in Rails
@@ -193,6 +194,7 @@ test_files:
 - test/dummy/config/initializers/mime_types.rb
 - test/dummy/config/initializers/secret_token.rb
 - test/dummy/config/initializers/session_store.rb
+- test/dummy/config/initializers/settr.rb
 - test/dummy/config/initializers/wrap_parameters.rb
 - test/dummy/config/locales/de.yml
 - test/dummy/config/locales/en.yml