sferik-merb-admin 0.3.0 → 0.3.1

data/README.markdown

@@ -14,7 +14,7 @@ At the command prompt, type:
 
 In your app, add the following dependency to `config/dependencies.rb`:
 
-    dependency "sferik-merb-admin", "0.3.0", :require_as => "merb-admin"
+    dependency "sferik-merb-admin", "0.3.1", :require_as => "merb-admin"
     dependency "dm-is-paginated", "0.0.1" # if you want pagination support
 
 Add the following route to `config/router.rb`:

data/Rakefile

@@ -12,7 +12,7 @@ AUTHOR = "Erik Michaels-Ober"
 EMAIL = "sferik@gmail.com"
 HOMEPAGE = "http://twitter.com/sferik"
 SUMMARY = "MerbAdmin is a Merb plugin that provides an easy-to-use interface for managing your data."
-GEM_VERSION = "0.3.0"
+GEM_VERSION = "0.3.1"
 
 spec = Gem::Specification.new do |s|
   s.rubyforge_project = "merb"

data/app/views/main/list.html.erb

@@ -59,8 +59,8 @@
               <thead>
                 <tr>
                   <% @properties.each do |property| %>
-                  <th class="<%= params[:sort] == property[:field] ? params[:sort_reverse] ? 'sorted descending' : 'sorted ascending' : nil %>">
-                    <a href="?<%= Merb::Parse.params_to_query_string(params.merge(:sort => property[:field]).reject{|key, value| key.to_sym == :sort_reverse}.merge(params[:sort] == property[:field] && params[:sort_reverse] != "true" ? {:sort_reverse => "true"} : {})) %>"><%= property[:pretty_name].capitalize %></a>
+                  <th class="<%= params[:sort] == property[:name].to_s ? params[:sort_reverse] ? 'sorted descending' : 'sorted ascending' : nil %>">
+                    <a href="?<%= Merb::Parse.params_to_query_string(params.merge(:sort => property[:name]).reject{|key, value| key.to_sym == :sort_reverse}.merge(params[:sort] == property[:name].to_s && params[:sort_reverse] != "true" ? {:sort_reverse => "true"} : {})) %>"><%= property[:pretty_name].capitalize %></a>
                   </th>
                   <% end %>
                 </tr>

data/lib/abstract_model.rb

@@ -1,6 +1,8 @@
+require 'generic_support'
+require 'datamapper_support'
+
 module MerbAdmin
   class AbstractModel
-
     # Returns all models for a given Merb app
     def self.all
       return @models if @models
@@ -40,131 +42,5 @@ module MerbAdmin
         raise "MerbAdmin does not currently support the #{Merb.orm} ORM"
       end
     end
-
-    module GenericSupport
-      def singular_name
-        model.to_s.snake_case.to_sym
-      end
-
-      def plural_name
-        model.to_s.snake_case.pluralize.to_sym
-      end
-
-      def pretty_name
-        model.to_s.snake_case.gsub('_', ' ')
-      end
-    end
-
-    module DatamapperSupport
-      def count(options = {})
-        model.count(options)
-      end
-
-      def find_all(options = {})
-        model.all(options)
-      end
-
-      def find(id)
-        model.get(id).extend(InstanceMethods)
-      end
-
-      def new(params = {})
-        model.new(params).extend(InstanceMethods)
-      end
-
-      def has_many_associations
-        associations.select do |association|
-          association[:type] == :has_many
-        end
-      end
-
-      def has_one_associations
-        associations.select do |association|
-          association[:type] == :has_one
-        end
-      end
-
-      def belongs_to_associations
-        associations.select do |association|
-          association[:type] == :belongs_to
-        end
-      end
-
-      def associations
-        model.relationships.to_a.map do |name, relationship|
-          {
-            :name => name,
-            :pretty_name => name.to_s.gsub('_', ' '),
-            :type => association_type_lookup(relationship),
-            :parent_model => relationship.parent_model,
-            :parent_key => relationship.parent_key.map{|r| r.name},
-            :child_model => relationship.child_model,
-            :child_key => relationship.child_key.map{|r| r.name},
-            :remote_relationship => relationship.options[:remote_relationship_name],
-            :near_relationship => relationship.options[:near_relationship_name],
-          }
-        end
-      end
-
-      def association_names
-        associations.map do |association|
-          association[:type] == :belongs_to ? association[:parent_name] : association[:child_name]
-        end
-      end
-
-      def properties
-        model.properties.map do |property|
-          {
-            :name => property.name,
-            :pretty_name => property.field.gsub('_', ' '),
-            :type => type_lookup(property),
-            :length => property.length,
-            :nullable? => property.nullable?,
-            :serial? => property.serial?,
-            :key? => property.key?,
-            :flag_map => property.type.respond_to?(:flag_map) ? property.type.flag_map : nil,
-          }
-        end
-      end
-
-      private
-
-      def association_type_lookup(relationship)
-        if self.model == relationship.parent_model
-          relationship.options[:max] > 1 ? :has_many : :has_one
-        elsif self.model == relationship.child_model
-          :belongs_to
-        else
-          raise "Unknown association type"
-        end
-      end
-
-      def type_lookup(property)
-        type = {
-          DataMapper::Types::Serial => :integer,
-          DataMapper::Types::Boolean => :boolean,
-          DataMapper::Types::Text => :text,
-          DataMapper::Types::ParanoidDateTime => :date_time,
-          Integer => :integer,
-          Fixnum => :integer,
-          Float => :float,
-          BigDecimal => :big_decimal,
-          TrueClass => :boolean,
-          String => :string,
-          DateTime => :date_time,
-          Date => :date,
-          Time => :time,
-        }
-        type[property.type] || type[property.primitive]
-      end
-
-      module InstanceMethods
-        def clear_association(association)
-          association.clear
-        end
-      end
-
-    end
-
   end
 end

data/lib/datamapper_support.rb

@@ -0,0 +1,114 @@
+module MerbAdmin
+  class AbstractModel
+    module DatamapperSupport
+      def count(options = {})
+        model.count(options)
+      end
+
+      def find_all(options = {})
+        model.all(options)
+      end
+
+      def find(id)
+        model.get(id).extend(InstanceMethods)
+      end
+
+      def new(params = {})
+        model.new(params).extend(InstanceMethods)
+      end
+
+      def has_many_associations
+        associations.select do |association|
+          association[:type] == :has_many
+        end
+      end
+
+      def has_one_associations
+        associations.select do |association|
+          association[:type] == :has_one
+        end
+      end
+
+      def belongs_to_associations
+        associations.select do |association|
+          association[:type] == :belongs_to
+        end
+      end
+
+      def associations
+        model.relationships.to_a.map do |name, relationship|
+          {
+            :name => name,
+            :pretty_name => name.to_s.gsub('_', ' '),
+            :type => association_type_lookup(relationship),
+            :parent_model => relationship.parent_model,
+            :parent_key => relationship.parent_key.map{|r| r.name},
+            :child_model => relationship.child_model,
+            :child_key => relationship.child_key.map{|r| r.name},
+            :remote_relationship => relationship.options[:remote_relationship_name],
+            :near_relationship => relationship.options[:near_relationship_name],
+          }
+        end
+      end
+
+      def association_names
+        associations.map do |association|
+          association[:type] == :belongs_to ? association[:parent_name] : association[:child_name]
+        end
+      end
+
+      def properties
+        model.properties.map do |property|
+          {
+            :name => property.name,
+            :pretty_name => property.field.gsub('_', ' '),
+            :type => type_lookup(property),
+            :length => property.length,
+            :nullable? => property.nullable?,
+            :serial? => property.serial?,
+            :key? => property.key?,
+            :flag_map => property.type.respond_to?(:flag_map) ? property.type.flag_map : nil,
+          }
+        end
+      end
+
+      private
+
+      def association_type_lookup(relationship)
+        if self.model == relationship.parent_model
+          relationship.options[:max] > 1 ? :has_many : :has_one
+        elsif self.model == relationship.child_model
+          :belongs_to
+        else
+          raise "Unknown association type"
+        end
+      end
+
+      def type_lookup(property)
+        type = {
+          DataMapper::Types::Serial => :integer,
+          DataMapper::Types::Boolean => :boolean,
+          DataMapper::Types::Text => :text,
+          DataMapper::Types::ParanoidDateTime => :date_time,
+          Integer => :integer,
+          Fixnum => :integer,
+          Float => :float,
+          BigDecimal => :big_decimal,
+          TrueClass => :boolean,
+          String => :string,
+          DateTime => :date_time,
+          Date => :date,
+          Time => :time,
+        }
+        type[property.type] || type[property.primitive]
+      end
+
+      module InstanceMethods
+        def clear_association(association)
+          association.clear
+        end
+      end
+
+    end
+  end
+end

data/lib/generic_support.rb

@@ -0,0 +1,17 @@
+module MerbAdmin
+  class AbstractModel
+    module GenericSupport
+      def singular_name
+        model.to_s.snake_case.to_sym
+      end
+
+      def plural_name
+        model.to_s.snake_case.pluralize.to_sym
+      end
+
+      def pretty_name
+        model.to_s.snake_case.gsub('_', ' ')
+      end
+    end
+  end
+end

data/lib/merb-admin.rb

@@ -23,7 +23,7 @@ if defined?(Merb::Plugins)
 
     # Slice metadata
     self.description = "MerbAdmin is a Merb plugin that provides an easy-to-use interface for managing your data."
-    self.version = "0.3.0"
+    self.version = "0.3.1"
     self.author = "Erik Michaels-Ober"
 
     # Stub classes loaded hook - runs before LoadClasses BootLoader

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sferik-merb-admin
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors: 
 - Erik Michaels-Ober
@@ -56,6 +56,8 @@ files:
 - README.markdown
 - Rakefile
 - lib/abstract_model.rb
+- lib/datamapper_support.rb
+- lib/generic_support.rb
 - lib/merb-admin
 - lib/merb-admin/merbtasks.rb
 - lib/merb-admin/slicetasks.rb