wheels 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/app/controllers/app_configs_controller.rb

@@ -0,0 +1,2 @@
+class AppConfigsController < InheritedResources::Base
+end

data/app/controllers/sitemaps_controller.rb

@@ -68,7 +68,7 @@ class SitemapsController < InheritedResources::Base
     resource.parent = parent
     update! do |format|
       if params.stringify_keys["sitemap"]["position"]
-        childrunz = Array.new(parent.children.sort{|t,u| t.position <=> u.position})
+        childrunz = Array.new(parent.children.sorted)
         childrunz.delete(resource)
         childrunz.insert(params.stringify_keys["sitemap"]["position"].to_i, resource)
         childrunz.each_with_index do |child, idx|

data/app/helpers/app_configs_helper.rb

@@ -0,0 +1,2 @@
+module AppConfigsHelper
+end

data/app/models/app_config.rb

@@ -0,0 +1,18 @@
+class AppConfig < ActiveRecord::Base
+  after_save :reload
+  validates :name, :presence=>true
+  def self.[](name)
+    val = select{|t| t.name==name}[0].try(:value)
+    if val && (val==val.to_i.to_s)
+      val = val.to_i
+    end
+    val
+  end
+  def self.current
+    @current ||= AppConfig.all
+  end
+  def self.reload
+    @current = nil
+  end
+end
+

data/app/models/sitemap.rb

@@ -1,7 +1,9 @@
 class Sitemap < ActiveRecord::Base
   has_many :children, :class_name=>'Sitemap', :foreign_key=>'parent_id', :dependent => :destroy do
     def sorted
-      sort{|t, u| t.position <=> u.position}
+      sort{|t, u| if t.nil? || t.position.nil?; 1;
+                  elsif u.nil? || u.position.nil?; -1;
+                  else t.position <=> u.position end}
     end
   end
 
@@ -26,6 +28,7 @@ class Sitemap < ActiveRecord::Base
 
   def as_json(*a)
     {
+      :position=>self.position,
       :data=>{
         :title=>self.menu_text,
         :icon=>icon_name,
@@ -39,7 +42,7 @@ class Sitemap < ActiveRecord::Base
         :data_id => self.id
       },
       :state=>treeview_state,
-      :children=> children.sort{|t,u| t.position <=> u.position}
+      :children=> children.sorted
     }.as_json(*a)
    end
 
@@ -51,7 +54,7 @@ class Sitemap < ActiveRecord::Base
   end
 
   def create_resource
-    resource ||= resource_type.constantize.new unless resource_type.nil?
+    self.resource ||= resource_type.constantize.new unless resource_type.nil?
   end
 
   def url

data/app/views/sitemaps/index.html.haml

@@ -59,13 +59,11 @@
           "format" : "json",
             #{authenticity_token_json}
         }
-        if (data['parent_id']) {post_data['parent_id'] = data['parent_id']}
-        if (data['menu_text']) {post_data['sitemap[menu_text]'] = data['menu_text']}
-        if (data['position']) {post_data['sitemap[position]'] = data['position']}
-        if (data['resource_id']) {post_data['sitemap[resource_id]'] = data['resource_id']}
-        if (data['resource_type']) {post_data['sitemap[resource_type]'] = data['resource_type']}
-        array_print('updateSiteMap Args', data);
-        array_print('updateSiteMap Data', post_data);
+        if (data['parent_id'] != null) {post_data['parent_id'] = data['parent_id']}
+        if (data['menu_text'] != null) {post_data['sitemap[menu_text]'] = data['menu_text']}
+        if (data['position'] != null) {post_data['sitemap[position]'] = data['position']}
+        if (data['resource_id'] != null) {post_data['sitemap[resource_id]'] = data['resource_id']}
+        if (data['resource_type'] != null) {post_data['sitemap[resource_type]'] = data['resource_type']}
 
         $.ajax({
           async : false,

data/wheels.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{wheels}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tyler Gannon"]
@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION",
      "app/controllers/access_control_entries_controller.rb",
+     "app/controllers/app_configs_controller.rb",
      "app/controllers/attachments_controller.rb",
      "app/controllers/blogs_controller.rb",
      "app/controllers/discussions_controller.rb",
@@ -36,6 +37,7 @@ Gem::Specification.new do |s|
      "app/controllers/sitemaps_controller.rb",
      "app/controllers/users_controller.rb",
      "app/helpers/access_control_entries_helper.rb",
+     "app/helpers/app_configs_helper.rb",
      "app/helpers/application_helper.rb",
      "app/helpers/blogs_helper.rb",
      "app/helpers/discussions_helper.rb",
@@ -48,6 +50,7 @@ Gem::Specification.new do |s|
      "app/mailers/feedback_mailer.rb",
      "app/models/ability.rb",
      "app/models/access_control_entry.rb",
+     "app/models/app_config.rb",
      "app/models/attachment.rb",
      "app/models/blog.rb",
      "app/models/discussion.rb",

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Tyler Gannon
@@ -44,6 +44,7 @@ files:
 - Rakefile
 - VERSION
 - app/controllers/access_control_entries_controller.rb
+- app/controllers/app_configs_controller.rb
 - app/controllers/attachments_controller.rb
 - app/controllers/blogs_controller.rb
 - app/controllers/discussions_controller.rb
@@ -59,6 +60,7 @@ files:
 - app/controllers/sitemaps_controller.rb
 - app/controllers/users_controller.rb
 - app/helpers/access_control_entries_helper.rb
+- app/helpers/app_configs_helper.rb
 - app/helpers/application_helper.rb
 - app/helpers/blogs_helper.rb
 - app/helpers/discussions_helper.rb
@@ -71,6 +73,7 @@ files:
 - app/mailers/feedback_mailer.rb
 - app/models/ability.rb
 - app/models/access_control_entry.rb
+- app/models/app_config.rb
 - app/models/attachment.rb
 - app/models/blog.rb
 - app/models/discussion.rb