active_admin_datetimepicker 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95942036891e999af2dd97323018fae6b4df523f
-  data.tar.gz: 2c3b5d594b17c4616e20503dc48154c2e5c19a07
+  metadata.gz: 340225652c1b7a23d5eb2c44e24ceee530d817e3
+  data.tar.gz: bc69629e0bb5c3d8f96d59a147b6f4faeeb84ac1
 SHA512:
-  metadata.gz: c70396c059789c4abc2a63527aaec2a38c0c33a6a79ddf006317a57878e82ebc105a2e5aad7d02e7f87e32f7f2ab530e4717f065b4b6107d52799d12471f1f9d
-  data.tar.gz: b65f6ca73e3e66d3e35b55cdfece5e09055cdee3430bcea0111401a7184eb02eb0455eb25e1a853b4abd4e6865cc9b71a347eb24f1c716bbe352a075803d0787
+  metadata.gz: 55a56f2c56811962a4d2305ec6b8d90c28e57842b8a86e7204f517cf286ea62a47f65a8f69f7be6dbadae51335184648c4c8b79279680b6374c1b4538e70b7e9
+  data.tar.gz: e50bdea210d76f47a8f272d62e9855300c82a2c251166af1b2a6c4adfcbe373e4c9c6edd112d63e42e709bb2477f1bc40780f1342f8895d48f82f232350a29b6

data/README.md

@@ -2,6 +2,9 @@
 
 Adds ability to use XDSoft's DateTime picker as the date_time_picker input for forms, and date_time_range for filters
 
+
+![ActiveAdminDatetimepicker](https://raw.githubusercontent.com/ActiveAdminPlugins/activeadmin_datetimepicker/master/screen/screen.png "ActiveAdminDatetimepicker")
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -32,8 +35,8 @@ The `date_time_picker` input accepts many of the options available to the standa
 
 ```ruby
 form do |f|
-  f.input :starts_at, as: :datepicker, datepicker_options: { min_date: "2013-10-8",        max_date: "+3D" }
-  f.input :ends_at,   as: :datepicker, datepicker_options: { min_date: 3.days.ago.to_date, max_date: "+1W +5D" }
+  f.input :starts_at, as: :date_time_picker, datepicker_options: { min_date: "2013-10-8",        max_date: "+3D" }
+  f.input :ends_at,   as: :date_time_picker, datepicker_options: { min_date: 3.days.ago.to_date, max_date: "+1W +5D" }
 end
 ```
 
@@ -41,6 +44,18 @@ end
     filter :created_at, as: :date_time_range
 ```
 
+
+## Override behaviour in initializer
+```ruby
+# This if for front-end javascript side
+ActiveAdminDatetimepicker::Base.default_datetime_picker_options = {
+    defaultDate: proc { Time.current.strftime("%Y-%m-%d 00:00") }
+}
+# This if for backend(Ruby)
+ActiveAdminDatetimepicker::Base.format = "%Y-%m-%d %H:%M:%S"
+```
+
+
 See [the datetimepicker documentation for more details](http://xdsoft.net/jqplugins/datetimepicker/).
 
 
@@ -52,7 +67,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-1. Fork it ( https://github.com/[my-github-username]/active_admin_datetimepicker/fork )
+1. Fork it ( https://github.com/activeadmin-plugins/activeadmin_datetimepicker/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/active_admin_datetimepicker.gemspec

@@ -0,0 +1,26 @@
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'active_admin_datetimepicker/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = "active_admin_datetimepicker"
+  spec.version       = ActiveAdminDatetimepicker::VERSION
+  spec.authors       = ["Igor Fedoronchuk"]
+  spec.email         = ["fedoronchuk@gmail.com"]
+
+  spec.summary       = %q{datetimepicker extension for ActiveAdmin}
+  spec.description   = %q{Integrate jQuery xdan datetimepicker plugin to ActiveAdmin}
+  spec.homepage      = "https://github.com/activeadmin-plugins/activeadmin_datetimepicker"
+  spec.license       = "MIT"
+
+  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.bindir        = "bin"
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+
+  spec.add_dependency "xdan-datetimepicker-rails", "~> 2.4"
+  spec.add_development_dependency "bundler", "~> 1.8"
+  spec.add_development_dependency "rake", "~> 10.0"
+
+end

data/lib/active_admin_datetimepicker.rb

@@ -1,14 +1,13 @@
-require "activeadmin"
-require "xdan-datetimepicker-rails"
-require "active_admin_datetimepicker/version"
-require "active_admin_datetimepicker/inputs/date_time_picker_input"
-require "active_admin_datetimepicker/inputs/filters/date_time_range_input"
+require 'activeadmin'
+require 'xdan-datetimepicker-rails'
+require 'active_admin_datetimepicker/version'
+require 'active_admin_datetimepicker/base'
+require 'active_admin_datetimepicker/inputs/date_time_picker_input'
+require 'active_admin_datetimepicker/inputs/filters/date_time_range_input'
 
 module ActiveAdminDatetimepicker
-    module Rails
-      class Engine < ::Rails::Engine
-
-      end
+  module Rails
+    class Engine < ::Rails::Engine
     end
-
+  end
 end

data/lib/active_admin_datetimepicker/base.rb

@@ -0,0 +1,59 @@
+module ActiveAdminDatetimepicker
+  module Base
+    mattr_accessor :default_datetime_picker_options do
+      {}
+    end
+
+    mattr_accessor :format do
+      '%Y-%m-%d %H:%M'
+    end
+
+    def html_class
+      'date-time-picker'
+    end
+
+    def input_html_data
+      {}
+    end
+
+    def input_html_options(input_name = nil)
+      options = {}
+      options[:class] = [self.options[:class], html_class].compact.join(' ')
+      options[:data] ||= input_html_data
+      options[:data].merge!(datepicker_options: datetime_picker_options)
+      options[:value] ||= input_value(input_name)
+      options[:maxlength] = 19
+      options
+    end
+
+    def input_value(input_name = nil)
+      val = object.public_send(input_name || method)
+      return DateTime.new(val.year, val.month, val.day, val.hour, val.min).strftime(format) if val.is_a?(Time)
+      val.to_s
+    end
+
+    def datetime_picker_options
+      @datetime_picker_options ||= begin
+        # backport support both :datepicker_options AND :datetime_picker_options
+        options = self.options.fetch(:datepicker_options, {})
+        options = self.options.fetch(:datetime_picker_options, options)
+        options = Hash[options.map { |k, v| [k.to_s.camelcase(:lower), v] }]
+        _default_datetime_picker_options.merge(options)
+      end
+    end
+
+    protected
+
+    def _default_datetime_picker_options
+      res = default_datetime_picker_options.map do |k, v|
+        if v.respond_to?(:call) || v.is_a?(Proc)
+          [k, v.call]
+        else
+          [k, v]
+        end
+      end
+      Hash[res]
+    end
+  end
+end
+

data/lib/active_admin_datetimepicker/inputs/date_time_picker_input.rb

@@ -1,28 +1,7 @@
 module ActiveAdmin
   module Inputs
     class DateTimePickerInput < ::Formtastic::Inputs::StringInput
-      def input_html_options
-        super.tap do |options|
-          options[:class] = [options[:class], "date-time-picker"].compact.join(' ')
-          options[:data] ||= {}
-          options[:data].merge! datepicker_options
-          options[:value] ||= value
-        end
-      end
-
-      def value
-        val = object.send(method)
-        return DateTime.new(val.year, val.month, val.day, val.hour, val.min).strftime("%Y-%m-%d %H:%M") if val.is_a?(Time)
-        return val if val.nil?
-        val.to_s
-      end
-
-      private
-      def datepicker_options
-        options = self.options.fetch(:datepicker_options, {})
-        options = Hash[options.map{ |k, v| [k.to_s.camelcase(:lower), v] }]
-        { datepicker_options: options }
-      end
+      include ActiveAdminDatetimepicker::Base
     end
   end
-end
+end

data/lib/active_admin_datetimepicker/inputs/filters/date_time_range_input.rb

@@ -3,23 +3,14 @@ module ActiveAdmin
     module Filters
       class DateTimeRangeInput < DateRangeInput
         include Base
-
-        def html_class
-          "date-time-picker"
-        end
-
-        def format
-          "%Y-%m-%d %H:%M"
-        end
+        include ActiveAdminDatetimepicker::Base
 
         def input_html_options(input_name = gt_input_name)
-          current_value = @object.public_send input_name
-          { size: 12,
-            class: html_class,
-            max: 10,
-            value: current_value.respond_to?(:strftime) ? current_value.strftime(format) : "" }
+          super.tap do |options|
+            options[:class] = html_class
+          end
         end
       end
     end
   end
-end
+end

data/lib/active_admin_datetimepicker/version.rb

@@ -1,3 +1,3 @@
 module ActiveAdminDatetimepicker
-  VERSION = "0.1.0"
+  VERSION = '0.1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_admin_datetimepicker
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Igor Fedoronchuk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-16 00:00:00.000000000 Z
+date: 2015-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xdan-datetimepicker-rails
@@ -64,9 +64,11 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- active_admin_datetimepicker.gemspec
 - app/assets/javascripts/active_admin_datetimepicker.js.coffee
 - app/assets/stylesheets/active_admin_datetimepicker.scss
 - lib/active_admin_datetimepicker.rb
+- lib/active_admin_datetimepicker/base.rb
 - lib/active_admin_datetimepicker/inputs/date_time_picker_input.rb
 - lib/active_admin_datetimepicker/inputs/filters/date_time_range_input.rb
 - lib/active_admin_datetimepicker/version.rb