merb-admin 0.8.5 → 0.8.6

data/lib/datamapper_support.rb

@@ -1,141 +1,145 @@
-require 'dm-core'
-require 'dm-aggregates'
-require 'dm-types'
-require 'dm-validations'
-
-module MerbAdmin
-  class AbstractModel
-    module DatamapperSupport
-      def get(id)
-        model.get(id).extend(InstanceMethods)
-      end
-
-      def count(options = {})
-        model.count(options.reject{|key, value| [:sort, :sort_reverse].include?(key)})
-      end
-
-      def first(options = {})
-        model.first(merge_order(options)).extend(InstanceMethods)
-      end
-
-      def all(options = {})
-        model.all(merge_order(options))
-      end
-
-      def paginated(options = {})
-        page = options.delete(:page) || 1
-        per_page = options.delete(:per_page) || MerbAdmin[:per_page]
-
-        page_count = (count(options).to_f / per_page).ceil
-
-        options.merge!({
-          :limit => per_page,
-          :offset => (page - 1) * per_page
-        })
-
-        [page_count, all(options)]
-      end
-
-      def create(params = {})
-        model.create(params).extend(InstanceMethods)
-      end
-
-      def new(params = {})
-        model.new(params).extend(InstanceMethods)
-      end
-
-      def destroy_all!
-        model.all.destroy!
-      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, association|
-          {
-            :name => name,
-            :pretty_name => name.to_s.gsub("_", " ").capitalize,
-            :type => association_type_lookup(association),
-            :parent_model => association.parent_model,
-            :parent_key => association.parent_key.map{|r| r.name},
-            :child_model => association.child_model,
-            :child_key => association.child_key.map{|r| r.name},
-          }
-        end
-      end
-
-      def properties
-        model.properties.map do |property|
-          {
-            :name => property.name,
-            :pretty_name => property.name.to_s.gsub(/_id$/, "").gsub("_", " ").capitalize,
-            :type => type_lookup(property),
-            :length => property.respond_to?(:length) ? property.length : nil,
-            :nullable? => property.allow_nil?,
-            :serial? => property.serial?,
-          }
-        end
-      end
-
-      private
-
-      def merge_order(options)
-        @sort ||= options.delete(:sort) || :id
-        @sort_order ||= options.delete(:sort_reverse) ? :desc : :asc
-        options.merge(:order => [@sort.to_sym.send(@sort_order)])
-      end
-
-      def association_type_lookup(association)
-        if self.model == association.parent_model
-          association.options[:max] > 1 ? :has_many : :has_one
-        elsif self.model == association.child_model
-          :belongs_to
-        else
-          raise "Unknown association type"
-        end
-      end
-
-      def type_lookup(property)
-        type = {
-          BigDecimal => :big_decimal,
-          DataMapper::Types::Boolean => :boolean,
-          DataMapper::Types::Serial => :integer,
-          DataMapper::Types::Text => :text,
-          Date => :date,
-          DateTime => :datetime,
-          FalseClass => :boolean,
-          Fixnum => :integer,
-          Float => :float,
-          Integer => :integer,
-          String => :string,
-          Time => :time,
-          TrueClass => :boolean,
-        }
-        type[property.type] || type[property.primitive]
-      end
-
-      module InstanceMethods
-        def update_attributes(attributes)
-          update(attributes)
-        end
-      end
-
-    end
-  end
-end
+require 'dm-core'
+require 'dm-aggregates'
+require 'dm-types'
+require 'dm-validations'
+
+module MerbAdmin
+  class AbstractModel
+    module DatamapperSupport
+      def get(id)
+        model.get(id).extend(InstanceMethods)
+      end
+
+      def count(options = {})
+        model.count(options.reject{|key, value| [:sort, :sort_reverse].include?(key)})
+      end
+
+      def first(options = {})
+        model.first(merge_order(options)).extend(InstanceMethods)
+      end
+
+      def last(options = {})
+        model.last(merge_order(options)).extend(InstanceMethods)
+      end
+
+      def all(options = {})
+        model.all(merge_order(options))
+      end
+
+      def paginated(options = {})
+        page = options.delete(:page) || 1
+        per_page = options.delete(:per_page) || MerbAdmin[:per_page]
+
+        page_count = (count(options).to_f / per_page).ceil
+
+        options.merge!({
+          :limit => per_page,
+          :offset => (page - 1) * per_page
+        })
+
+        [page_count, all(options)]
+      end
+
+      def create(params = {})
+        model.create(params).extend(InstanceMethods)
+      end
+
+      def new(params = {})
+        model.new(params).extend(InstanceMethods)
+      end
+
+      def destroy_all!
+        model.all.destroy!
+      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, association|
+          {
+            :name => name,
+            :pretty_name => name.to_s.gsub("_", " ").capitalize,
+            :type => association_type_lookup(association),
+            :parent_model => association.parent_model,
+            :parent_key => association.parent_key.map{|r| r.name},
+            :child_model => association.child_model,
+            :child_key => association.child_key.map{|r| r.name},
+          }
+        end
+      end
+
+      def properties
+        model.properties.map do |property|
+          {
+            :name => property.name,
+            :pretty_name => property.name.to_s.gsub(/_id$/, "").gsub("_", " ").capitalize,
+            :type => type_lookup(property),
+            :length => property.respond_to?(:length) ? property.length : nil,
+            :nullable? => property.allow_nil?,
+            :serial? => property.serial?,
+          }
+        end
+      end
+
+      private
+
+      def merge_order(options)
+        @sort ||= options.delete(:sort) || :id
+        @sort_order ||= options.delete(:sort_reverse) ? :desc : :asc
+        options.merge(:order => [@sort.to_sym.send(@sort_order)])
+      end
+
+      def association_type_lookup(association)
+        if self.model == association.parent_model
+          association.options[:max] > 1 ? :has_many : :has_one
+        elsif self.model == association.child_model
+          :belongs_to
+        else
+          raise "Unknown association type"
+        end
+      end
+
+      def type_lookup(property)
+        type = {
+          BigDecimal => :big_decimal,
+          DataMapper::Types::Boolean => :boolean,
+          DataMapper::Types::Serial => :integer,
+          DataMapper::Types::Text => :text,
+          Date => :date,
+          DateTime => :datetime,
+          FalseClass => :boolean,
+          Fixnum => :integer,
+          Float => :float,
+          Integer => :integer,
+          String => :string,
+          Time => :time,
+          TrueClass => :boolean,
+        }
+        type[property.type] || type[property.primitive]
+      end
+
+      module InstanceMethods
+        def update_attributes(attributes)
+          update(attributes)
+        end
+      end
+
+    end
+  end
+end

data/lib/generic_support.rb

@@ -1,13 +1,13 @@
-module MerbAdmin
-  class AbstractModel
-    module GenericSupport
-      def to_param
-        model.to_s.snake_case
-      end
-
-      def pretty_name
-        model.to_s.snake_case.gsub('_', ' ').capitalize
-      end
-    end
-  end
-end
+module MerbAdmin
+  class AbstractModel
+    module GenericSupport
+      def to_param
+        model.to_s.snake_case
+      end
+
+      def pretty_name
+        model.to_s.snake_case.gsub('_', ' ').capitalize
+      end
+    end
+  end
+end

data/lib/merb-admin.rb

@@ -1,100 +1,100 @@
-if defined?(Merb::Plugins)
-
-  $:.unshift File.dirname(__FILE__)
-
-  require 'merb-slices'
-  Merb::Plugins.add_rakefiles "merb-admin/merbtasks", "merb-admin/slicetasks", "merb-admin/spectasks"
-
-  # Register the Slice for the current host application
-  Merb::Slices::register(__FILE__)
-
-  # Slice configuration - set this in a before_app_loads callback.
-  # By default a Slice uses its own layout, so you can swicht to
-  # the main application layout or no layout at all if needed.
-  #
-  # Configuration options:
-  # :layout - the layout to use; defaults to :merb-admin
-  # :mirror - which path component types to use on copy operations; defaults to all
-  Merb::Slices::config[:merb_admin][:layout] ||= :merb_admin
-  Merb::Slices::config[:merb_admin][:per_page] ||= 100
-  Merb::Slices::config[:merb_admin][:excluded_models] ||= []
-
-  # All Slice code is expected to be namespaced inside a module
-  module MerbAdmin
-
-    # Slice metadata
-    self.description = "MerbAdmin is a Merb plugin that provides an easy-to-use interface for managing your data."
-    self.version = "0.8.5"
-    self.author = "Erik Michaels-Ober"
-
-    # Stub classes loaded hook - runs before LoadClasses BootLoader
-    # right after a slice's classes have been loaded internally.
-    def self.loaded
-    end
-
-    # Initialization hook - runs before AfterAppLoads BootLoader
-    def self.init
-    end
-
-    # Activation hook - runs after AfterAppLoads BootLoader
-    def self.activate
-    end
-
-    # Deactivation hook - triggered by Merb::Slices.deactivate(MerbAdmin)
-    def self.deactivate
-    end
-
-    def self.setup_router(scope)
-      scope.match("/", :method => :get).
-        to(:controller => "main", :action => "index").
-        name(:dashboard)
-
-      scope.match("/:model_name", :method => :get).
-        to(:controller => "main", :action => "list").
-        name(:list)
-
-      scope.match("/:model_name/new", :method => :get).
-        to(:controller => "main", :action => "new").
-        name(:new)
-
-      scope.match("/:model_name/:id/edit", :method => :get).
-        to(:controller => "main", :action => "edit").
-        name(:edit)
-
-      scope.match("/:model_name", :method => :post).
-        to(:controller => "main", :action => "create").
-        name(:create)
-
-      scope.match("/:model_name/:id", :method => :put).
-        to(:controller => "main", :action => "update").
-        name(:update)
-
-      scope.match("/:model_name/:id/delete", :method => :get).
-        to(:controller => "main", :action => "delete").
-        name(:delete)
-
-      scope.match("/:model_name/:id(.:format)", :method => :delete).
-        to(:controller => "main", :action => "destroy").
-        name(:destroy)
-    end
-
-  end
-
-  # Setup the slice layout for MerbAdmin
-  #
-  # Use MerbAdmin.push_path and MerbAdmin.push_app_path
-  # to set paths to merb-admin-level and app-level paths. Example:
-  #
-  # MerbAdmin.push_path(:application, MerbAdmin.root)
-  # MerbAdmin.push_app_path(:application, Merb.root / 'slices' / 'merb-admin')
-  # ...
-  #
-  # Any component path that hasn't been set will default to MerbAdmin.root
-  #
-  # Or just call setup_default_structure! to setup a basic Merb MVC structure.
-  MerbAdmin.setup_default_structure!
-
-  # Add dependencies for other MerbAdmin classes below. Example:
-  # dependency "merb-admin/other"
-
-end
+if defined?(Merb::Plugins)
+
+  $:.unshift File.dirname(__FILE__)
+
+  require 'merb-slices'
+  Merb::Plugins.add_rakefiles "merb-admin/merbtasks", "merb-admin/slicetasks", "merb-admin/spectasks"
+
+  # Register the Slice for the current host application
+  Merb::Slices::register(__FILE__)
+
+  # Slice configuration - set this in a before_app_loads callback.
+  # By default a Slice uses its own layout, so you can swicht to
+  # the main application layout or no layout at all if needed.
+  #
+  # Configuration options:
+  # :layout - the layout to use; defaults to :merb-admin
+  # :mirror - which path component types to use on copy operations; defaults to all
+  Merb::Slices::config[:merb_admin][:layout] ||= :merb_admin
+  Merb::Slices::config[:merb_admin][:per_page] ||= 100
+  Merb::Slices::config[:merb_admin][:excluded_models] ||= []
+
+  # All Slice code is expected to be namespaced inside a module
+  module MerbAdmin
+
+    # Slice metadata
+    self.description = "MerbAdmin is a Merb plugin that provides an easy-to-use interface for managing your data."
+    self.version = "0.8.6"
+    self.author = "Erik Michaels-Ober"
+
+    # Stub classes loaded hook - runs before LoadClasses BootLoader
+    # right after a slice's classes have been loaded internally.
+    def self.loaded
+    end
+
+    # Initialization hook - runs before AfterAppLoads BootLoader
+    def self.init
+    end
+
+    # Activation hook - runs after AfterAppLoads BootLoader
+    def self.activate
+    end
+
+    # Deactivation hook - triggered by Merb::Slices.deactivate(MerbAdmin)
+    def self.deactivate
+    end
+
+    def self.setup_router(scope)
+      scope.match("/", :method => :get).
+        to(:controller => "main", :action => "index").
+        name(:dashboard)
+
+      scope.match("/:model_name", :method => :get).
+        to(:controller => "main", :action => "list").
+        name(:list)
+
+      scope.match("/:model_name/new", :method => :get).
+        to(:controller => "main", :action => "new").
+        name(:new)
+
+      scope.match("/:model_name/:id/edit", :method => :get).
+        to(:controller => "main", :action => "edit").
+        name(:edit)
+
+      scope.match("/:model_name", :method => :post).
+        to(:controller => "main", :action => "create").
+        name(:create)
+
+      scope.match("/:model_name/:id", :method => :put).
+        to(:controller => "main", :action => "update").
+        name(:update)
+
+      scope.match("/:model_name/:id/delete", :method => :get).
+        to(:controller => "main", :action => "delete").
+        name(:delete)
+
+      scope.match("/:model_name/:id(.:format)", :method => :delete).
+        to(:controller => "main", :action => "destroy").
+        name(:destroy)
+    end
+
+  end
+
+  # Setup the slice layout for MerbAdmin
+  #
+  # Use MerbAdmin.push_path and MerbAdmin.push_app_path
+  # to set paths to merb-admin-level and app-level paths. Example:
+  #
+  # MerbAdmin.push_path(:application, MerbAdmin.root)
+  # MerbAdmin.push_app_path(:application, Merb.root / 'slices' / 'merb-admin')
+  # ...
+  #
+  # Any component path that hasn't been set will default to MerbAdmin.root
+  #
+  # Or just call setup_default_structure! to setup a basic Merb MVC structure.
+  MerbAdmin.setup_default_structure!
+
+  # Add dependencies for other MerbAdmin classes below. Example:
+  # dependency "merb-admin/other"
+
+end