agilibox 1.0.14 → 1.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a1aedfde807ff11e7230b83d1c65305f4abe9b6
-  data.tar.gz: ec2ff7c3c3bc68c383b3ba4887a4c0f006c80a61
+  metadata.gz: 6ed08a7d086225ae4abf9cac6f5f7a2e4e9250f0
+  data.tar.gz: c2c2fb53c41d945c973f0938f2809209090b02f4
 SHA512:
-  metadata.gz: 95781e7dba7620ecdcd196a15b0788618b70d401391163e7443d3576e522f560fd62d5fcc39d1a6f8be8aea4b468569d3c498926770b4ffd30cd6e63e7d6dc9d
-  data.tar.gz: 830a06fca765d269ba0445df621d04d5f0fbf73783e138567c8254e0ee63ad76f51fa95d3e4c875c3dea247db6767347fe84e4322283751fe7144188fdaf1420
+  metadata.gz: ca24f0844a6aca0e1abcac9db9d11a1620dc132034afa8aa8c737eb90b177f169cf1dfaef242e286bc7d1890f433ef23f257787d1bc2e232081ad82c288c57f5
+  data.tar.gz: 1bc57502c9ba25e4645ba42135967b258df0be8a30ff3f2f4460399056fcffdd0774a41b7d2cb46b993ade48b8d21f832b617122de0e2e81dcb45e8038c21f63

data/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 ## Next version
 
+## 1.0.15
+
+- `ApiControllerConcern#render_json_error` improvements
+- Add Agilibox::Service object
+- Fix SMS AmazonSNS strategy bug
+- Fix time period filter
+
 ## 1.0.14
 
 - Sorting helper improvements

data/app/controllers/concerns/agilibox/api_controller_concern.rb

@@ -12,16 +12,18 @@ module Agilibox::ApiControllerConcern
     render options.merge(json: json)
   end
 
-  def render_json_error(message_or_object, options = {})
-    if message_or_object.is_a?(ActiveRecord::Base)
-      message = message_or_object.errors.full_messages.join(", ")
+  def render_json_error(any_object, options = {})
+    if any_object.is_a?(ActiveRecord::Base)
+      json = {error: any_object.errors.full_messages.join(", ")}
+    elsif any_object.is_a?(String)
+      json = {error: any_object}
     else
-      message = message_or_object
+      json = any_object
     end
 
     options[:status] ||= :unprocessable_entity
 
-    render_json({error: message}, options)
+    render_json(json, options)
   end
 
   def render_not_found

data/app/filters/agilibox/small_data/filter_strategy_by_time_period.rb

@@ -1,5 +1,7 @@
 class Agilibox::SmallData::FilterStrategyByTimePeriod < ::Agilibox::SmallData::FilterStrategyByKeyValue
   def apply(query, value) # rubocop:disable Metrics/MethodLength
+    value = value.to_s
+
     if value == "today"
       a = Time.zone.now.beginning_of_day
       b = Time.zone.now.end_of_day
@@ -28,10 +30,10 @@ class Agilibox::SmallData::FilterStrategyByTimePeriod < ::Agilibox::SmallData::F
       return query
     end
 
-    criteria = "#{query.model.table_name}.#{key}"
+    column = key.is_a?(Symbol) ? "#{query.model.table_name}.#{key}" : key.to_s
 
     query
-      .where("#{criteria} >= ?", a.to_date)
-      .where("#{criteria} <= ?", b.to_date)
+      .where("DATE(#{column}) >= ?", a.to_date)
+      .where("DATE(#{column}) <= ?", b.to_date)
   end
 end

data/app/libs/agilibox/initialize_with.rb

@@ -0,0 +1,20 @@
+module Agilibox::InitializeWith
+  extend ActiveSupport::Concern
+
+  class_methods do
+    def initialize_with(*attrs)
+      attr_reader(*attrs)
+
+      define_method(:initialize) do |*args|
+        if attrs.length != args.length
+          message = "wrong number of arguments (given #{args.length}, expected #{attrs.length})"
+          raise ArgumentError, message
+        end
+
+        attrs.length.times do |i|
+          instance_variable_set("@#{attrs[i]}", args[i])
+        end
+      end
+    end
+  end # class_methods
+end

data/app/services/agilibox/service.rb

@@ -0,0 +1,11 @@
+class Agilibox::Service
+  include Agilibox::InitializeWith
+
+  def self.call(*args)
+    new(*args).call
+  end
+
+  def call(*)
+    raise NotImplementedError
+  end
+end

data/app/sms/agilibox/sms/strategies/amazon_sns.rb

@@ -1,18 +1,18 @@
 class Agilibox::SMS::Strategies::AmazonSNS < Agilibox::SMS::Strategies::Base
   class << self
-    attr_writer :region
+    attr_writer :sns_region
 
     def sns_region
       @sns_region ||= (ENV["SNS_REGION"] || ENV["AWS_REGION"])
     end
 
-    attr_writer :access_key_id
+    attr_writer :sns_access_key_id
 
     def sns_access_key_id
       @sns_access_key_id ||= (ENV["SNS_ACCESS_KEY_ID"] || ENV["AWS_ACCESS_KEY_ID"])
     end
 
-    attr_writer :secret_access_key
+    attr_writer :sns_secret_access_key
 
     def sns_secret_access_key
       @sns_secret_access_key ||= (ENV["SNS_SECRET_ACCESS_KEY"] || ENV["AWS_SECRET_ACCESS_KEY"])

data/features/support/env.rb

@@ -1,3 +1,3 @@
-ENV["RAILS_ROOT"] ||= File.expand_path("../../../spec/dummy", __FILE__)
+ENV["RAILS_ROOT"] ||= File.expand_path("../../spec/dummy", __dir__)
 require "cucumber/rails"
 require "agilibox/cucumber_config"

data/lib/agilibox/version.rb

@@ -1,3 +1,3 @@
 module Agilibox
-  VERSION = "1.0.14"
+  VERSION = "1.0.15"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: agilibox
 version: !ruby/object:Gem::Version
-  version: 1.0.14
+  version: 1.0.15
 platform: ruby
 authors:
 - agilidée
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-07 00:00:00.000000000 Z
+date: 2018-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails-i18n
@@ -102,6 +102,7 @@ files:
 - app/helpers/agilibox/sorting_helper.rb
 - app/helpers/agilibox/text_helper.rb
 - app/helpers/h.rb
+- app/libs/agilibox/initialize_with.rb
 - app/libs/agilibox/mini_model_serializer/serialize.rb
 - app/libs/agilibox/mini_model_serializer/serializer.rb
 - app/libs/agilibox/phone_number_sanitizer.rb
@@ -117,6 +118,7 @@ files:
 - app/serializers/agilibox/serializers.rb
 - app/serializers/agilibox/serializers/base.rb
 - app/serializers/agilibox/serializers/xlsx.rb
+- app/services/agilibox/service.rb
 - app/sms/agilibox/sms.rb
 - app/sms/agilibox/sms/application_sms.rb
 - app/sms/agilibox/sms/strategies/amazon_sns.rb