admin_it 1.0.11 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29a6d776198ded9d1cf8d3bf12731a86219e2d71
-  data.tar.gz: 675c20d9e4f38cca59e19e690f99ed6d565bfcad
+  metadata.gz: 65d9841e47dc5873e0e1b358138f1736ff6dbbe0
+  data.tar.gz: a517d4d77720694fccb35cd9742b4d9812516f07
 SHA512:
-  metadata.gz: 72e6c716d4821a967a2bd4639733aca51e8a12833771199fc901d305e0347af72a1ec4cdb5bb1904ae3543180cc9b127519e428e6692c7611db84625cfdaf6e8
-  data.tar.gz: e2d9330e064c19f681c2d1e48e6a1a4d39cc9e74a54cd14b75f8e56841c662860beb09bca479514e4e441ce5b7d1267b595a8f5c5a9257d1f214a5e8b6a6af7e
+  metadata.gz: a2ae93d3c5dfdbc6bb519dcb3945e2306136a62d43982e099bf8c181d99fa3254e63a21b2cc570065c36d84d3c71bfbefdcd54c7abae3ea3c629f700aa8ff5f7
+  data.tar.gz: c598b3285ab2dfefdf9a92bc50fb7f3207178c3936f506c25d364a1113b35189aa23c5b8d420d18b1fd0970ceee82748b1102f2b9187fe199a146baf8460fb47

data/.gitignore

@@ -3,6 +3,7 @@
 .bundle
 .config
 .yardoc
+.ruby-version
 Gemfile.lock
 Gemfile.*.lock
 InstalledFiles

data/Gemfile

@@ -2,4 +2,11 @@ source 'https://rubygems.org'
 
 gemspec
 
-# gem 'wrap_it', path: '../wrap_it'
+# integration includes
+gem 'activerecord' if ENV['USE_ACTIVERECORD']
+if ENV['USE_MONGOID']
+  gem 'mongoid', github: 'mongoid/mongoid'
+  gem 'bson_ext'
+  gem 'bson'
+  gem 'moped', github: 'mongoid/moped'
+end

data/README.md

@@ -27,10 +27,8 @@ bundle install
 
 # Todo
 
-* use_fields not working in root resource context
 * human-readable date and time fields
 * Test coverage
-* Entities editing/creating
 
 ## Longtime plans
 
@@ -38,6 +36,10 @@ bundle install
 
 # Changes
 
+`1.1.0`
+* ensure_it integration
+* mongoid integration
+
 `1.0.10`
 
 * added: sorting indicator in table column header

data/admin_it.gemspec

@@ -25,6 +25,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'rails', '~> 4.0'
   spec.add_dependency 'devise'
   spec.add_dependency 'wrap_it'
+  spec.add_dependency 'ensure_it'
 
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'sqlite3'

data/lib/admin_it.rb

@@ -1,15 +1,18 @@
+if !defined?(EnsureIt) && RUBY_VERSION >= '2.1.0'
+  require 'ensure_it_refined'
+else
+  require 'ensure_it'
+end
+
 require 'extend_it'
-require File.join %w(extend_it ensures)
 
+#
 module AdminIt
-  using ExtendIt::Ensures if ExtendIt.config.use_refines?
-
   LAYOUTS = %i(dialog)
 end
 
 require File.join %w(admin_it env)
 require File.join %w(admin_it errors)
-require File.join %w(admin_it utils)
 require File.join %w(admin_it config)
 require File.join %w(admin_it shared)
 require File.join %w(admin_it data)
@@ -19,6 +22,5 @@ require File.join %w(admin_it filters)
 require File.join %w(admin_it resource)
 require File.join %w(admin_it context)
 require File.join %w(admin_it controller)
-require File.join %w(admin_it definitions)
 require File.join %w(admin_it engine)
 require File.join %w(admin_it helpers)

data/lib/admin_it/actions/action.rb

@@ -1,4 +1,8 @@
+#
 module AdminIt
+  using EnsureIt if EnsureIt.refined?
+
+  #
   class Action
     extend ExtendIt::Base
     include ExtendIt::Dsl
@@ -12,8 +16,7 @@ module AdminIt
     attr_reader :layout
 
     def layout=(value)
-      value = value.ensure_symbol
-      @layout = value.nil? || LAYOUTS.include?(value) ? value : nil
+      @layout = value.ensure_symbol(values: LAYOUTS)
     end
   end
 end

data/lib/admin_it/config.rb

@@ -1,4 +1,5 @@
 module AdminIt
+  #
   module Config
     def self.root
       @root ||= Rails.root.join('app', 'admin_it')

data/lib/admin_it/context/collection_context.rb

@@ -1,7 +1,11 @@
 require 'json'
 require 'csv'
 
+#
 module AdminIt
+  using EnsureIt if EnsureIt.refined?
+
+  #
   class CollectionContext < Context
     extend FiltersHolder
 
@@ -39,13 +43,14 @@ module AdminIt
     end
 
     def self.sortable_fields(*names)
-      names = names.ensure_symbols
+      names = names.ensure_array(:flatten, :ensure_symbol, :compact, :uniq)
       fields.each do |_field|
         _field.sortable = names.include?(_field.field_name)
       end
     end
 
     attr_accessor :entity
+    attr_writer :entities
     class_attr_reader :entities_getter, :path, :show_in_dialog?
 
     before_load do |store: {}, params: {}|
@@ -165,9 +170,9 @@ module AdminIt
       self.entities = collection
     end
 
-    def entities=(value)
-      @entities = value
-    end
+    # def entities=(value)
+    #   @entities = value
+    # end
 
     def entities
       self.entity = nil
@@ -196,6 +201,7 @@ module AdminIt
     end
   end
 
+  #
   class ListContext < CollectionContext
     def self.path
       AdminIt::Engine.routes.url_helpers.send("list_#{resource.plural}_path")

data/lib/admin_it/context/context.rb

@@ -3,9 +3,11 @@ require File.join %w(extend_it dsl)
 require File.join %w(extend_it base)
 require File.join %w(extend_it callbacks)
 
-using ExtendIt::Ensures
-
+#
 module AdminIt
+  using EnsureIt if EnsureIt.refined?
+
+  #
   class Context
     extend ExtendIt::Base
     extend ExtendIt::Dsl
@@ -27,7 +29,7 @@ module AdminIt
     define_callbacks :initialize, :load, :save
 
     def self.create(context_name, _resource)
-      fail ArgumentError, 'Wrong resource' unless _resource.is_a?(Resource)
+      _resource.ensure_instance_of!(Resource)
       base = self
       Class.new(base) do
         @resource = _resource
@@ -101,9 +103,7 @@ module AdminIt
           store = store[name] ||= {}
         end
 
-        if params.nil?
-          params = controller.request.query_parameters
-        end
+        params = controller.request.query_parameters if params.nil?
         params = Hash[params.map { |k, v| [k.to_sym, v] }]
 
         run_callbacks :load, arguments: { params: params, store: store } do
@@ -158,10 +158,11 @@ module AdminIt
     def layout=(value)
       value = value.to_sym if value.is_a?(String)
       return unless value.is_a?(Symbol)
-      @layout = case value
-      when :dialog then 'dialog'
-      else ''
-      end
+      @layout =
+        case value
+        when :dialog then 'dialog'
+        else ''
+        end
     end
 
     def parent=(value)
@@ -196,9 +197,7 @@ module AdminIt
     end
 
     def url_params(**params)
-      unless @parent.nil?
-        params.merge!(parent: @parent.send(:context_param))
-      end
+      params.merge!(parent: @parent.send(:context_param)) unless @parent.nil?
       params
     end
 

data/lib/admin_it/context/show_context.rb

@@ -1,4 +1,8 @@
+#
 module AdminIt
+  using EnsureIt if EnsureIt.refined?
+
+  #
   class ShowContext < SingleContext
     extend Renderable
     include Identifiable
@@ -22,9 +26,7 @@ module AdminIt
     end
 
     def self.read(entity)
-      unless @read.nil?
-        @read.call(entity)
-      end
+      @read.call(entity) unless @read.nil?
     end
 
     attr_reader :confirm
@@ -34,8 +36,7 @@ module AdminIt
     end
 
     def confirm=(value)
-      value = value.downcase.to_sym if value.is_a?(String)
-      return unless value.is_a?(Symbol) && CONFIRMS.include?(value)
+      value = value.ensure_symbol(downcase: true, values: CONFIRMS) || return
       @confirm = value
     end
 

data/lib/admin_it/context/single_context.rb

@@ -1,4 +1,8 @@
+#
 module AdminIt
+  using EnsureIt if EnsureIt.refined?
+
+  #
   class Section
     extend ExtendIt::Base
     include ExtendIt::Dsl
@@ -11,16 +15,17 @@ module AdminIt
       dsl_boolean :visible
 
       def use_fields(*names, except: nil)
-        names = names.ensure_symbols
+        names = names.ensure_array(:flatten, :ensure_symbol, :compact, :uniq)
+        except = except.ensure_array(:flatten, :ensure_symbol, :compact, :uniq)
         fields =
-          if names.nil? || names.empty?
+          if names.empty?
             dsl_get(:fields, default: [])
           else
             context = dsl_get(:context, default: nil)
             names & context.fields.map(&:field_name)
           end
-        fields -= except.ensure_symbols unless except.nil?
-        dsl_set(:fields, fields.uniq)
+        fields -= except
+        dsl_set(:fields, fields)
       end
     end
 
@@ -40,6 +45,7 @@ module AdminIt
     end
   end
 
+  #
   module Identifiable
     def self.included(base)
       base.extend(ClassMethods)
@@ -53,10 +59,12 @@ module AdminIt
       identity.nil? ? super : "#{super}(#{identity})"
     end
 
+    #
     module ClassMethods
     end
   end
 
+  #
   class SingleContext < Context
     dsl do
       dsl_block :entity_getter, :entity_saver, :entity_destroyer
@@ -64,7 +72,7 @@ module AdminIt
       dsl_hash_of_objects :sections, single: :section do |name, **opts|
         if @sections.empty?
           # TODO: require this and other files after I18n config in engine.rb
-          #general.display_name(I18n.t('admin_it.collection.no_data'))
+          # general.display_name(I18n.t('admin_it.collection.no_data'))
           general = Section.new(
             :general,
             self,
@@ -91,7 +99,8 @@ module AdminIt
       )
     end
 
-    class_attr_reader :entity_getter, :entity_saver, :entity_destroyer, :sections
+    class_attr_reader :entity_getter, :entity_saver, :entity_destroyer,
+                      :sections
     attr_accessor :entity
 
     after_load do |store: {}, params: {}|
@@ -117,8 +126,7 @@ module AdminIt
     end
 
     def section=(value)
-      value = value.downcase.to_sym if value.is_a?(String)
-      return unless value.is_a?(Symbol)
+      value = value.ensure_symbol(downcase: true) || return
       if sections.empty?
         return if section != :none
       else
@@ -153,6 +161,7 @@ module AdminIt
     end
   end
 
+  #
   class SavableSingleContext < SingleContext
     def self.save_action; end
 
@@ -177,6 +186,7 @@ module AdminIt
     def do_save_entity; end
   end
 
+  #
   class EditContext < SavableSingleContext
     include Identifiable
 
@@ -203,6 +213,7 @@ module AdminIt
     end
   end
 
+  #
   class NewContext < SavableSingleContext
     def self.path
       AdminIt::Engine.routes.url_helpers.send("new_#{resource.name}_path")

data/lib/admin_it/context/table_context.rb

@@ -1,4 +1,5 @@
 module AdminIt
+  #
   class TableContext < CollectionContext
     dsl do
       dsl_accessor :page_size, default: 10
@@ -50,13 +51,14 @@ module AdminIt
 
     def page=(value)
       if value.is_a?(String)
-        value = case value.downcase
-        when 'next' then page + 1
-        when 'prev', 'previous' then page - 1
-        when 'first' then 1
-        when 'last' then pages
-        else value.to_i
-        end
+        value =
+          case value.downcase
+          when 'next' then page + 1
+          when 'prev', 'previous' then page - 1
+          when 'first' then 1
+          when 'last' then pages
+          else value.to_i
+          end
       end
       if value.is_a?(Fixnum) && value > 0 && value <= pages
         # reset entities enumerator if page changed

data/lib/admin_it/context/tiles_context.rb

@@ -1,4 +1,5 @@
 module AdminIt
+  #
   class TilesContext < CollectionContext
     dsl do
       dsl_accessor :header do |value|

data/lib/admin_it/controller.rb

@@ -1,8 +1,10 @@
 module AdminIt
+  #
   module Controller
     def self.included(base)
       base.class_eval do
         include Pundit if AdminIt::Env.pundit?
+        before_filter :authenticate_user!
 
         attr_reader :context
         helper_method :context, :resource
@@ -31,7 +33,7 @@ module AdminIt
       @context = context_class.new(self)
       yield if block_given?
       layout = ['admin_it', params[:layout]].compact.join('_')
-      if !performed?
+      unless performed?
         if layout == 'admin_it' && !request.query_parameters.empty?
           redirect_to request.path
         else

data/lib/admin_it/data.rb

@@ -1,8 +1,8 @@
 require File.join %w(admin_it data data_behavior)
 require File.join %w(admin_it data object)
 require File.join %w(admin_it data hash)
-require File.join %w(admin_it data active_record)
 
+#
 module AdminIt
   def self.register_data(entity_class, mod)
     return if entity_class.nil?
@@ -20,5 +20,7 @@ module AdminIt
 
   register_data Object, AdminIt::ObjectData
   register_data Hash, AdminIt::HashData
-  register_data ActiveRecord::Base, AdminIt::ActiveRecordData
 end
+
+require File.join %w(admin_it data active_record)
+require File.join %w(admin_it data mongoid)

data/lib/admin_it/data/active_record.rb

@@ -1,303 +1,12 @@
-module AdminIt
-  module ActiveRecordData
-    module Resource
-      protected
-
-      TYPE_MAPPING = {
-        primary_key: :integer,
-        string: :string,
-        text: :string,
-        integer: :integer,
-        float: :float,
-        decimal: :float,
-        datetime: :datetime,
-        timestamp: :datetime,
-        time: :time,
-        date: :date,
-        binary: :binary,
-        boolean: :boolean
-      }
-
-      def default_display_name
-        entity_class
-          .model_name
-          .human#(count: 0)
-          .split(' ')
-          .map { |s| s.mb_chars.capitalize }
-          .join(' ')
-      end
-
-      def default_fields(&block)
-        enum = Enumerator.new do |yielder|
-          exclude = []
-          entity_class.reflections.each do |name, a|
-            f = AdminIt::Field.create(name, entity_class, type: :relation)
-            f.assoc = a
-            yielder << f
-            exclude << "#{name}_id" if a.belongs_to?
-          end
-          entity_class.columns_hash.each do |name, c|
-            next if exclude.include?(name)
-            name = name.to_sym
-            opts = { type: TYPE_MAPPING[c.type] }
-            if name == :id
-              opts[:visible] = false
-              opts[:writable] = false
-            end
-            yielder << AdminIt::Field.create(name, entity_class, opts)
-          end
-        end
-        block_given? ? enum.each(&block) : enum
-      end
-
-      def default_filters
-        enum = Enumerator.new do |yielder|
-          fields.each do |field|
-            next if field.type == :relation
-            name = "#{field.field_name}_value"
-            yielder << AdminIt::ValueFilter.create(name, self, field)
-          end
-        end
-        block_given? ? enum.each(&block) : enum
-      end
-    end
-
-    module CollectionContext
-      def entities=(value)
-        super(value)
-        @count = @entities.nil? ? 0 : @entities.count
-      end
-
-      protected
-
-      def load_entities
-        collection =
-          if AdminIt::Env.pundit?
-            controller.policy_scope(entity_class)
-          else
-            entity_class.all
-          end
-        if child?
-          collection = collection.where(parent.resource.name => parent.entity)
-        end
-        sort = {}
-        sorting.each do |_sort|
-          name, order = _sort.split(':')
-          sort[name.to_sym] = order.to_sym
-        end
-        unless collection.nil? || sort.empty?
-          collection = collection.order(sort)
-        end
-        collection
-      end
-    end
-
-    module SingleContext
-      protected
-
-      def load_entity(identity: nil)
-        identity ||= controller.params[:id]
-        entity = entity_class.find(identity)
-        if AdminIt::Env.pundit?
-          controller.authorize(entity, "#{name}?")
-        end
-        if child?
-          fields
-            .select { |f| f.type == :relation &&
-                          f.assoc.klass == parent.entity_class }
-            .each do |f|
-              if f.assoc.collection?
-                entity.send(f.name) << parent.entity
-              else
-                entity.send("#{f.name}=", parent.entity)
-              end
-            end
-        end
-        entity
-      end
-    end
-
-    module SavableSingleContext
-      protected
-
-      def do_save_entity
-        if AdminIt::Env.pundit?
-          controller.authorize(entity, "#{self.class.save_action}?")
-        end
-        params = controller.params[resource.name]
-        fields(scope: :writable).each do |field|
-          next unless params.key?(field.name)
-          next unless field.writable?
-          next if field.type == :relation
-          field.write(entity, params[field.name])
-        end
-        if entity.save
-          controller.redirect_to_default
-        end
-      end
-
-      def add_child_context(for_resource, context_class: :table)
-        child_resource = AdminIt.resources[for_resource]
-        return nil if child_resource.nil?
-        child_resource[context_class].new(self)
-      end
-    end
-
-    module NewContext
-      def self.included(base)
-        base.after_initialize do
-          if child?
-            fields
-              .select { |f| f.type == :relation &&
-                            f.assoc.klass == parent.entity_class }
-              .each do |f|
-                if f.assoc.collection?
-                  entity.send(f.name) << parent.entity
-                else
-                  entity.send("#{f.name}=", parent.entity)
-                end
-                f.visible = false
-              end
-          end
-        end
-      end
-
-      protected
-
-      def load_entity(identity: nil)
-        entity = entity_class.new
-        if AdminIt::Env.pundit?
-          controller.authorize(entity, "#{name}?")
-        end
-        entity
-      end
-    end
-
-    module ShowContext
-      def identity
-        entity.id
-      end
-
-      protected
-
-      def do_destroy_entity
-        if AdminIt::Env.pundit?
-          controller.authorize(entity, :destroy?)
-        end
-        if entity.destroy
-          controller.redirect_to_default
-        end
-      end
-    end
-
-    module EditContext
-      def identity
-        entity.id
-      end
-    end
-
-    module TableContext
-      def entities
-        if @entities.count > page_size
-          # limit collection to current page
-          @entities = @entities
-            .offset(page_size * (page - 1))
-            .limit(page_size)
-        end
-        super
-      end
-    end
-
-    module Field
-      def self.included(base)
-        base.class_eval do
-          class << self
-            attr_accessor :assoc
-
-            protected
-
-            def default_display_name
-              entity_class.human_attribute_name(field_name)
-            end
-          end
-          class_attr_reader :assoc
-        end
-      end
-
-      protected
-
-      def read_value(entity)
-        value = entity.send(name)
-        if type == :relation
-          if assoc.collection?
-            value.nil? || value.empty? ? [] : value.map(&:id).to_json
-          else
-            value.nil? ? nil : value.id
-          end
-        else
-          value
-        end
-      end
-
-      def show_value(entity)
-        value = entity.send(name)
-        if type == :relation
-          resource = AdminIt.resources.values.find do |r|
-            r.entity_class == assoc.klass
-          end
-          return I18n.t('admin_it.relation.no_resource') if resource.nil?
-          context = resource.contexts.find { |c| c <= ShowContext }
-          return I18n.t('admin_it.relation.no_context') if context.nil?
-          if assoc.collection?
-            if value.count == 0
-              I18n.t('admin_it.collection.no_data')
-            else
-              v = context.read(value.first)
-              v.nil? ? '' : context.read(value.first) + ' ...'
-            end
-          else
-            context.read(value)
-          end
-        else
-          value
-        end
-      end
-
-      def write_value(entity, value)
-        entity.send("#{name}=", value)
-      end
-    end
-
-    module ValueFilter
-      def all_values(collection = nil, &block)
-        enum = Enumerator.new do |yielder|
-          field
-            .entity_class
-            .select(self.class.field.field_name)
-            .group(self.class.field.field_name)
-            .count
-            .each do |v, c|
-              yielder << { value: v, count: c }
-            end
-        end
-        block_given? ? enum.each(&block) : enum
-      end
-
-      def apply(collection)
-        return collection if @values.empty?
-        binding = []
-        conditions = ''
-        if @values.size == 1 && @values[0].nil?
-          conditions = "#{field.field_name} IS NULL"
-        else
-          conditions = "#{field.field_name} IN (?)"
-          binding << @values.select { |v| !v.nil? }
-          if @values.any? { |v| v.nil? }
-            conditions += " OR #{field.field_name} IS NULL"
-          end
-        end
-        collection = collection.where(conditions, *binding)
-      end
-    end
+if AdminIt::Env.active_record?
+  require File.join %w(admin_it data active_record resource)
+  require File.join %w(admin_it data active_record collection_context)
+  require File.join %w(admin_it data active_record single_context)
+  require File.join %w(admin_it data active_record field)
+  require File.join %w(admin_it data active_record filter)
+
+  #
+  module AdminIt
+    register_data ActiveRecord::Base, AdminIt::ActiveRecordData
   end
 end