typus 3.1.5 → 3.1.6

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: typus
 version: !ruby/object:Gem::Version
-  version: 3.1.5
+  version: 3.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-10 00:00:00.000000000 Z
+date: 2012-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
-  requirement: &70133893099040 !ruby/object:Gem::Requirement
+  requirement: &70213462925800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70133893099040
+  version_requirements: *70213462925800
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &70133893112440 !ruby/object:Gem::Requirement
+  requirement: &70213462924980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,29 +32,29 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70133893112440
+  version_requirements: *70213462924980
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &70133893109900 !ruby/object:Gem::Requirement
+  requirement: &70213462921200 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.12.4
   type: :runtime
   prerelease: false
-  version_requirements: *70133893109900
+  version_requirements: *70213462921200
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70133893108560 !ruby/object:Gem::Requirement
+  requirement: &70213462939560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *70133893108560
+  version_requirements: *70213462939560
 description: Ruby on Rails Admin Panel (Engine) to allow trusted users edit structured
   content.
 email:
@@ -63,7 +63,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- CHANGELOG
+- CHANGELOG.md
 - Gemfile
 - MIT-LICENSE
 - README.md
@@ -102,6 +102,7 @@ files:
 - app/helpers/admin/resources/data_types/has_and_belongs_to_many_helper.rb
 - app/helpers/admin/resources/data_types/has_many_helper.rb
 - app/helpers/admin/resources/data_types/has_one_helper.rb
+- app/helpers/admin/resources/data_types/integer_helper.rb
 - app/helpers/admin/resources/data_types/paperclip_helper.rb
 - app/helpers/admin/resources/data_types/position_helper.rb
 - app/helpers/admin/resources/data_types/selector_helper.rb
@@ -258,9 +259,12 @@ files:
 - lib/typus/orm/active_record/user/class_methods.rb
 - lib/typus/orm/active_record/user/instance_methods.rb
 - lib/typus/orm/active_record/user/instance_methods_more.rb
-- lib/typus/orm/base.rb
+- lib/typus/orm/base/class_methods.rb
+- lib/typus/orm/base/search.rb
 - lib/typus/orm/mongoid.rb
 - lib/typus/orm/mongoid/class_methods.rb
+- lib/typus/orm/mongoid/instance_methods.rb
+- lib/typus/orm/mongoid/search.rb
 - lib/typus/regex.rb
 - lib/typus/resources.rb
 - lib/typus/version.rb
@@ -307,7 +311,7 @@ files:
 - vendor/assets/fancybox/fancybox-x.png
 - vendor/assets/fancybox/fancybox-y.png
 - vendor/assets/fancybox/fancybox.png
-- vendor/assets/fancybox/jquery.fancybox-1.3.4.css
+- vendor/assets/fancybox/jquery.fancybox-1.3.4.css.erb
 - vendor/assets/fancybox/jquery.fancybox-1.3.4.pack.js
 - vendor/assets/formalize/.gitignore
 - vendor/assets/formalize/css/formalize.css
@@ -329,7 +333,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4534583435995700232
+      hash: 3351687569820403912
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -338,7 +342,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4534583435995700232
+      hash: 3351687569820403912
 requirements: []
 rubyforge_project: typus
 rubygems_version: 1.8.11

data/lib/typus/orm/base.rb

@@ -1,167 +0,0 @@
-module Typus
-  module Orm
-    module Base
-
-      # Model fields as an <tt>ActiveSupport::OrderedHash</tt>.
-      def model_fields; end
-
-      # Model relationships as an <tt>ActiveSupport::OrderedHash</tt>.
-      def model_relationships; end
-
-      # Model description for admin panel.
-      def typus_description
-        read_model_config['description']
-      end
-
-      # Form and list fields
-      def typus_fields_for(filter); end
-
-      def typus_filters; end
-
-      # Extended actions for this model on Typus.
-      def typus_actions_on(filter)
-        actions = read_model_config['actions']
-        actions && actions[filter.to_s] ? actions[filter.to_s].extract_settings : []
-      end
-
-      # Used for +search+, +relationships+
-      def typus_defaults_for(filter)
-        read_model_config[filter.to_s].try(:extract_settings) || []
-      end
-
-      def typus_search_fields
-        Hash.new.tap do |search|
-          typus_defaults_for(:search).each do |field|
-            if field.starts_with?("=")
-              field.slice!(0)
-              search[field] = "="
-            elsif field.starts_with?("^")
-              field.slice!(0)
-              search[field] = "^"
-            else
-              search[field] = "@"
-            end
-          end
-        end
-      end
-
-      def typus_application
-        name = read_model_config['application'] || 'Unknown'
-        name.extract_settings.first
-      end
-
-      def typus_field_options_for(filter)
-        options = read_model_config['fields']['options']
-        options && options[filter.to_s] ? options[filter.to_s].extract_settings.map(&:to_sym) : []
-      end
-
-      #--
-      # With +Typus::Resources.setup+ we can define application defaults.
-      #
-      #     Typus::Resources.setup do |config|
-      #       config.per_page = 25
-      #     end
-      #
-      # If for any reason we need a better default for an specific resource we
-      # can override it on +application.yaml+.
-      #
-      #     Post:
-      #       ...
-      #       options:
-      #         per_page: 25
-      #++
-      def typus_options_for(filter)
-        options = read_model_config['options']
-
-        unless options.nil? || options[filter.to_s].nil?
-          options[filter.to_s]
-        else
-          Typus::Resources.send(filter)
-        end
-      end
-
-      def typus_order_by
-        typus_defaults_for(:order_by).map do |field|
-          field.include?('-') ? "#{field.delete('-')} DESC" : "#{field} ASC"
-        end.join(', ')
-      end
-
-      #--
-      # Define our own boolean mappings.
-      #
-      #     Post:
-      #       fields:
-      #         default: title, status
-      #         options:
-      #           booleans:
-      #             status: "Published", "Not published"
-      #
-      #++
-      def typus_boolean(attribute = :default)
-        options = read_model_config['fields']['options']
-
-        boolean = if options && options['booleans'] && boolean = options['booleans'][attribute.to_s]
-          boolean.is_a?(String) ? boolean.extract_settings : boolean
-        else
-          ["True", "False"]
-        end
-
-        [[boolean.first, "true"], [boolean.last, "false"]]
-      end
-
-      #--
-      # Custom date formats.
-      #++
-      def typus_date_format(attribute = :default)
-        options = read_model_config['fields']['options']
-        if options && options['date_formats'] && options['date_formats'][attribute.to_s]
-          options['date_formats'][attribute.to_s].to_sym
-        else
-          :default
-        end
-      end
-
-      #--
-      # This is user to use custome templates for attribute:
-      #
-      #     Post:
-      #       fields:
-      #         form: title, body, status
-      #         options:
-      #           templates:
-      #             body: rich_text
-      #
-      # Templates are stored on <tt>app/views/admin/templates</tt>.
-      #++
-      def typus_template(attribute)
-        options = read_model_config['fields']['options']
-        if options && options['templates'] && options['templates'][attribute.to_s]
-          options['templates'][attribute.to_s]
-        end
-      end
-
-      def adapter
-        @adapter ||= ::ActiveRecord::Base.configurations[Rails.env]['adapter']
-      end
-
-      def typus_user_id?
-        columns.map(&:name).include?(Typus.user_foreign_key)
-      end
-
-      def read_model_config
-        Typus::Configuration.config[name] or raise "No typus configuration specified for #{name}"
-      end
-
-      #--
-      #     >> Post.to_resource
-      #     => "posts"
-      #     >> Admin::User.to_resource
-      #     => "admin/users"
-      #++
-      def to_resource
-        name.underscore.pluralize
-      end
-
-    end
-  end
-end