web-connect 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46c01a037f963376c2475ba338353470e4927227
-  data.tar.gz: 8abec4e3235754d5b02bbfbd1314c42fba11a4d9
+  metadata.gz: 7f2d79d7e04cd133c4f3ac7ebfec21fa50742650
+  data.tar.gz: c8db33715f544a85a17cb89e5a1be90d6bdf5f2b
 SHA512:
-  metadata.gz: 335be258f02a2d6dd1af9a7a51f83072f97ee145b8d26030b8940ee0e35326f4bcf98de1134b475f198297edc0a53f30de1bdc4c95c1109f697fc8f0f10a84f2
-  data.tar.gz: 02025fc9226f02c71bd60950adf7ef870d6dc4b9041156d64a16d41bd71e91e846a7affc76ccd9f845b39df5e44ca70866954d2a0062ab309a99754a48086e32
+  metadata.gz: ab76e029cfa6d7d95e7490bd87c87de34872e40ac8f4153f49214035991880d3f757e60d56ccaad0d172ed0c5cd42c494ab6b9a87ae36b6c4ceb620d5ffd01d0
+  data.tar.gz: bb3cee43adee9ac75af954f63e4ef4649764000ab2ce6a2d6d82cf49367377efc190ab35f08de2192e9b34fd5cfb88e4e29ace99edce3e217644fd389a1da8c1

data/lib/netfira/web_connect/db_schema/20140515_alpha.rb

@@ -91,10 +91,10 @@ class Alpha < Netfira::WebConnect::Migration
     create_file_table :images do |t|
       t.float :focus_point_top
       t.float :focus_point_left
-      t.integer :size
       t.integer :width
       t.integer :height
     end
+
     create_file_table :attachments
 
     create_relation_table :products, :images

data/lib/netfira/web_connect/migration.rb

@@ -52,8 +52,10 @@ module Netfira::WebConnect
       create_table table_name do |t|
         t.references :shop
         t.string :file_name, index: true
+        t.string :remote_location
         t.string :locale
         yield t if block_given?
+        t.integer :size
         t.binary :checksum, limit: 16
         t.binary :digest, limit: 16
         t.timestamps

data/lib/netfira/web_connect/model/record/file_record.rb

@@ -1,4 +1,5 @@
 require 'paperclip'
+require 'open-uri'
 
 Paperclip.interpolates :shop_id do |record, x|
   record.instance.shop_id
@@ -24,6 +25,19 @@ module Netfira::WebConnect
 
     end
 
+    class Validator < ActiveModel::Validator
+      def self.remote_file_sources_filter
+        @remote_file_sources_filter ||= Regexp.new(ENV['REMOTE_FILE_SOURCES_FILTER'] || '^https?://', Regexp::IGNORECASE)
+      end
+      def validate(record)
+        if record.remote_location && !(record.remote_location =~ self.class.remote_file_sources_filter)
+          record.errors[:remote_location] << 'Unacceptable format'
+        end
+      end
+    end
+
+    validates_with Validator
+
     after_initialize :set_file_defaults
 
     def <<(input)
@@ -41,14 +55,19 @@ module Netfira::WebConnect
 
     def checksum=(value)
       @checksum = nil
-      self[:checksum] = Checksum === value ? value.b : value
+      self[:checksum] = normalize_checksum(value)
     end
 
     def data
-      attachment.present? ? Paperclip.io_adapters.for(attachment) : nil
+      @stream ||= if remote_location
+        open remote_location.sub(/^file:/, '')
+      elsif attachment.present?
+        Paperclip.io_adapters.for attachment
+      end
     end
 
     def data=(value)
+      @stream = nil
       self.attachment = value
       value.rewind
       self.checksum = Checksum.of(value.read)
@@ -75,5 +94,20 @@ module Netfira::WebConnect
     def set_file_defaults
       self.locale ||= shop.locale
     end
+
+    def normalize_checksum(value)
+      if Checksum === value
+        value.b
+      elsif String === value
+        case value.length
+          when 22 then OctaWord.from_base64(value).b
+          when 32 then OctaWord.from_hex(value).b
+          else value
+        end
+      else
+        value
+      end
+    end
+
   end
 end

data/lib/netfira/web_connect/models/support/setting.rb

@@ -1,15 +1,15 @@
+require 'ostruct'
+
 module Netfira::WebConnect
   class Models::Setting < Model::Support
 
     belongs_to :shop, inverse_of: :setting_models
 
+    around_save :dispatch_change_event
+    before_destroy :dispatch_destroy_event
+
     def typed_value
-      case content_type
-        when 'application/json' then JSON.parse(value, quirks_mode: true)
-        when 'application/octet-stream' then value.b
-        when /^text\/plain;charset=(.+)$/ then value.force_encoding($1)
-        else value
-      end
+      cast_by_content_type value, content_type
     end
 
     def typed_value=(value)
@@ -27,5 +27,30 @@ module Netfira::WebConnect
       end
     end
 
+    private
+
+    def cast_by_content_type(value, content_type)
+      case content_type
+        when 'application/json' then JSON.parse(value, quirks_mode: true)
+        when 'application/octet-stream' then value.b
+        when /^text\/plain;charset=(.+)$/ then value.force_encoding($1)
+        else value
+      end
+    end
+
+    def dispatch_change_event
+      old = persisted? ? cast_by_content_type(changed_attributes['value'], changed_attributes['content_type']) : nil
+      yield
+      new = OpenStruct.new(shop: shop, key: key, value: typed_value)
+      Netfira::WebConnect.dispatch_event 'change_setting', new, old unless old == new.value
+    end
+
+    def dispatch_destroy_event
+      return unless persisted?
+      new = OpenStruct.new(shop: shop, key: key, value: nil)
+      old = typed_value
+      Netfira::WebConnect.dispatch_event 'change_setting', new, old unless old.nil?
+    end
+
   end
 end

data/lib/netfira/web_connect/rack_app/actions/version_8/commit/records.rb

@@ -20,13 +20,15 @@ module Netfira::WebConnect
         attributes.each do |key, value|
           key = key.underscore
           next if key == origin_key
-          if key == 'checksum' && klass < Model::Record::FileRecord
+          if key == 'checksum' && klass < Model::Record::FileRecord && !attributes['remoteLocation']
             request_file klass, attributes['fileName'] if record.checksum != value
             next
           end
           record.write_with_type_casting(key.to_sym, value) or raise BadRequest, "#{klass.name.demodulize.pluralize} don't have #{key} fields"
         end
-        record.save or raise InternalServerError, record.errors
+        record.save or
+            raise BadRequest.new "#{klass.name.demodulize} record could not be saved",
+                                 errors: record.errors.messages.map { |k, v| [k.to_s.camelize(:lower), v] }.to_h
         complete_record record
       end
 

data/lib/netfira/web_connect/rack_app/actions/version_8/settings.rb

@@ -36,12 +36,8 @@ class Netfira::WebConnect::RackApp
       def get_single(key)
         setting = shop.setting_models.find_by(key: key)
         raise NotFound unless setting
-        # if setting.content_type == 'application/json'
-        #   JSON.parse(setting.value, quirks_mode: true)
-        # else
-          header 'Content-Type', setting.content_type
-          setting.value
-        # end
+        header 'Content-Type', setting.content_type
+        setting.value
       end
 
       def delete_single(key)

data/lib/netfira/web_connect/rack_app/exceptions/http_exception.rb

@@ -13,13 +13,26 @@ module Netfira::WebConnect::RackApp::Exceptions
 
     def_delegators :'self.class', :status, :code, :category
 
-    def initialize(*args, &block)
-      super *args, &block
+    def initialize(message = nil, details = nil)
+      super message
       @headers = self.class.headers.dup
+      @details = details
+    end
+
+    def body
+      @body ||= make_body
     end
 
     attr_reader :headers
 
+    private
+
+    def make_body
+      body = {errorMessage: message}
+      body.merge! @details if Hash === @details
+      body
+    end
+
   end
 
   module HttpExceptions

data/lib/netfira/web_connect/rack_app.rb

@@ -11,7 +11,7 @@ module Netfira::WebConnect
           make_response 200, body, headers
         end
       rescue Exceptions::HttpException => e
-        make_response e.code, {errorMessage: e.message}, e.headers, e.code
+        make_response e.code, e.body, e.headers, e.code
       end
     end
 

data/lib/netfira/web_connect/version.rb

@@ -1,5 +1,5 @@
 module Netfira
   module WebConnect
-    VERSION = '0.1.2'
+    VERSION = '0.1.4'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: web-connect
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - Neil E. Pearson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-04 00:00:00.000000000 Z
+date: 2014-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord