syncable_models 0.0.7 → 0.0.8

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDBiNTZlY2I3YTI0YTc1ZmFhYjRiMDEwZWY4NWNiNmJhNGQ2NjczOQ==
+    OGIwODg1OTU1NDI2MThhYzNjNDVjZWU1OWUyMzcwMDI2OGY1MmRhZg==
   data.tar.gz: !binary |-
-    MDZiNzZlOTc1YzRkYzYzN2ZhNzM3ZTgwOTAzY2UwODMxYjAzMzQ3MA==
+    MzczYzA4ZDJlODQwMGYwZTE1OGE0MWViOTMwMGZjZmFjZDM2YTJkMw==
 SHA512:
   metadata.gz: !binary |-
-    MDQ5NjUwZGM4ODM0ZjE1MDkyNzRlYmYzNDMyYmUxMDk1ZWI1YzQ3MDZlYWYy
-    MzEwYTcyOTEyMDY4OGEzOWYxNDc2YmU1NmY5OWY1MmY1YjgyMDFhODcxZGI0
-    MDM4YmI5NWFlNDc1ZjE1ZmM5ZWRjZTE5OTFlMDdmMzViYjMxNjc=
+    MzcyMWE4MjEwY2IzOTgwOGViZDMzNWQ2ZDc4OTc5YjlhYmEzZTA3OGVkM2Ji
+    YjcxYWRjN2RjNzg1MTE2MzJlYmE4ZjM1ZDhkNjVlOTBkOGU5ODE4YTE0ZGYx
+    MzY5OTQ2MzZlOTBjMWNiZDliMWYyNGFlNTllMDhhMjNkYWQxOTA=
   data.tar.gz: !binary |-
-    MDkyNzRjYzYwYTllMDFjY2QyZjczMGExMmY5ZWUwMTY1NmI5NTkzOWYwYjU2
-    ZDEzNTk4OTE0OWM1MjZlMmM2YThlZWE0NDdkYTZjZTFhYmVhYWM3MTIzMmFi
-    N2U2Y2VhMTY2NzRlNjg5NGFhNzZmOGU4YjdiMzUyYjkwOTNmMWI=
+    ZmY3YmRiYWZjOTE4OThjODFiZTZiYWEzMjY4ZTNmMGQ0YjAwZmZiYmIyYzRh
+    ZWQ5OWYxZWQ4NzdiZTY5NzNiMDJiNTE2ZGJjMDRmMWNiMWRmZTg5ZDMxZjkw
+    MjFmZmRkZWY2MDg3OTM1NDUwNjY1OGY4M2NlZWIwZWJkNzlkODU=

data/lib/syncable_models/controller.rb

@@ -4,23 +4,28 @@ module SyncableModels::Controller
   BATCH_COUNT = 50
 
   module ClassMethods
-  def sync_for(subject, class_name: nil, sync_method: nil, fetch_method: nil)
-    klass = class_name || subject.to_s.singularize.camelize
-    klass = klass.constantize unless klass.is_a?(Class)
-
-    sync_method = sync_method || "sync_#{subject}"
-    fetch_method = fetch_method || "#{subject}"
-
-    class_eval """
-      def #{sync_method}
-        set_synced #{klass.name}
-      end
-
-      def #{fetch_method}
-        fetch #{klass.name}
-      end
-    """
-  end
+    def sync_for(subject, class_name: nil, sync_method: nil, fetch_method: nil)
+      klass = class_name || subject.to_s.singularize.camelize
+      klass = klass.constantize unless klass.is_a?(Class)
+
+      sync_method = sync_method || "sync_#{subject}"
+      fetch_method = fetch_method || "#{subject}"
+
+      class_eval """
+        def #{sync_method}
+          set_synced #{klass.name}
+        end
+
+        def #{fetch_method}
+          fetch #{klass.name}
+        end
+      """
+    end
+
+    def authorize_by_key(key=nil)
+      define_method(:api_key){ key }
+      before_action :do_authorize_by_key
+    end
   end
 
   def fetch(klass)
@@ -45,4 +50,10 @@ module SyncableModels::Controller
   def render_argument_error
     return render json: { status: 400, message: 'Not enough arguments' }
   end
+
+  def do_authorize_by_key
+    if params[:key] != api_key
+      return render json: { status: 401, message: 'Unauthorized'}
+    end
+  end
 end

data/lib/syncable_models/version.rb

@@ -1,3 +1,3 @@
 module SyncableModels
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/lib/syncable_models_importer.rb

@@ -2,7 +2,7 @@ require 'faraday'
 
 module SyncableModelsImporter
   class Import
-    attr_accessor :api_url, :destination
+    attr_accessor :api_url, :api_key, :destination
     attr_reader :models
 
     def initialize
@@ -25,29 +25,39 @@ module SyncableModelsImporter
       @api_url[-1] == '/' ? @api_url : @api_url + "/"
     end
 
+    def params_with_api_key(params)
+      params.merge!(key: api_key) if api_key
+      params
+    end
+
     def import
       @models.each do |model_name, params|
         fetch_url = self.api_url + params[:fetch_path]
         sync_url = self.api_url + params[:sync_path]
 
         conn = Faraday.new(url: fetch_url)
-        response = conn.get '', destination: self.destination
+        response = conn.get '', params_with_api_key(destination: destination)
 
         if response.success?
           response = JSON.parse(response.body)
 
+          if response["status"].to_i == 401
+            puts "[SyncableModelsImporter] Wrong api key!"
+          end
+
           if response['objects'] && response['objects'].count > 0
             klass = model_name.constantize
             synced_ids = []
 
             response['objects'].each do |o|
               result = klass.from_import_hash(o)
+              puts "[SyncableModelsImporter] Importing #{model_name} (id=#{o[params[:id_key].to_s]}): #{ result ? 'OK' : 'FAIL' }"
               synced_ids << o[params[:id_key].to_s] if result
             end
 
             if synced_ids.any?
               conn = Faraday.new(url: sync_url)
-              response = conn.get '', destination: self.destination, ids: synced_ids
+              response = conn.get '', params_with_api_key(destination: self.destination, ids: synced_ids)
             end
           end
         end

data/test/dummy/log/test.log

@@ -1,7 +1,7 @@
-   (2.8ms)  CREATE TABLE "syncs" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "subject_id" integer, "subject_type" varchar, "destination" varchar, "created_at" datetime, "updated_at" datetime) 
-   (0.2ms)  select sqlite_version(*)
-   (2.4ms)  CREATE  INDEX "index_syncs_on_destination" ON "syncs" ("destination")
-   (0.2ms)              SELECT sql
+   (2.0ms)  CREATE TABLE "syncs" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "subject_id" integer, "subject_type" varchar, "destination" varchar, "created_at" datetime, "updated_at" datetime) 
+   (0.1ms)  select sqlite_version(*)
+   (1.7ms)  CREATE  INDEX "index_syncs_on_destination" ON "syncs" ("destination")
+   (0.1ms)              SELECT sql
             FROM sqlite_master
             WHERE name='index_syncs_on_destination' AND type='index'
             UNION ALL
@@ -9,14 +9,14 @@
             FROM sqlite_temp_master
             WHERE name='index_syncs_on_destination' AND type='index'
 
-   (2.3ms)  CREATE  INDEX "index_syncs_on_subject_id_and_subject_type_and_destination" ON "syncs" ("subject_id", "subject_type", "destination")
-   (3.8ms)  CREATE TABLE "schema_migrations" ("version" varchar NOT NULL) 
-   (2.2ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (1.6ms)  CREATE  INDEX "index_syncs_on_subject_id_and_subject_type_and_destination" ON "syncs" ("subject_id", "subject_type", "destination")
+   (1.6ms)  CREATE TABLE "schema_migrations" ("version" varchar NOT NULL) 
+   (1.8ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
    (0.1ms)  SELECT version FROM "schema_migrations"
-   (2.7ms)  INSERT INTO "schema_migrations" (version) VALUES ('20160225141153')
+   (1.3ms)  INSERT INTO "schema_migrations" (version) VALUES ('20160225141153')
   ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
-   (0.2ms)  begin transaction
+   (0.1ms)  begin transaction
 ------------------------------
 SyncableModelsTest: test_truth
 ------------------------------
-   (0.1ms)  rollback transaction
+   (0.0ms)  rollback transaction

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: syncable_models
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Serafim Nenarokov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-17 00:00:00.000000000 Z
+date: 2016-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord