clerk-rails 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8fc72472099f48dfd7b073a34b63f3e2586c005c5d33153dd2c387fe45316902
-  data.tar.gz: fe08b5909129f27e517c523f571d83507bf573064a528b6c77da4227e0c58001
+  metadata.gz: 5ebd7434ec6b1e5d225ac7de149693f061e1204ca473ad4e17a5bfea5868a489
+  data.tar.gz: 5c75c18dad6e96ae75ef990eea3a1f37673153d91bc7c47b6885cc6d2a0ef885
 SHA512:
-  metadata.gz: 7753b548f6b4ebad847b51756430511750e94b2dcc58fd38e94192377be8c21efa5051a2032febda1efa002ce63f5647d6e80d2990c0baf6a151390dbea725ca
-  data.tar.gz: 408dd88b31dd599b73530782874192a1cceb5adbea9521afc179989542575430e62b1fb700ed4b7f94ae0baa2048a4b56b8c0ae1014ea9f4f77d770f16a4b960
+  metadata.gz: 9b10930865c7a58a193845a2e5108915801142fb0172ea877e575481f9d44cfa8fd440bc30f7d15b8209166d06f1db6286f0721818a3f5ef39fb13b2904d1840
+  data.tar.gz: ec883cfa162d37fbf9aace0db5a43d011dd21ddc2dfd739a23b4e829054e1cb5bf54aeda39e865ba37ba84cc285c01635557a729a7282eb1cb507155f37438a7

data/config/initializers/add_application_helpers.rb

@@ -0,0 +1 @@
+::ActionController::Base.send :include, Clerk::ApplicationHelper

data/config/initializers/add_clerk_roles.rb

@@ -0,0 +1,55 @@
+[::ActiveRecord::Base].each do |base|
+  base.class_eval do
+
+    def self.clerk(association_name, permissions: [])
+      plural_role = association_name.to_s.pluralize.to_sym
+      singular_role = association_name.to_s.singularize.to_sym
+
+      roles_association = :"clerk_roles_#{association_name}"
+
+      remote_class = self.name
+
+      unless self.respond_to? :clerk_roles
+        self.class_eval do 
+          include Clerk::Clerked
+        end
+      end
+
+      has_many roles_association, 
+        ->{ where(scope_class: remote_class, name: singular_role) }, 
+        class_name: "Clerk::Role", 
+        foreign_key: :scope_id
+
+      plural_role = association_name.to_s.pluralize.to_sym
+      singular_role = association_name.to_s.singularize.to_sym
+
+      account_accessor = self.name.underscore.pluralize.to_sym
+
+      # Add clerk permissions to `self` the associated class
+      self.clerk_permissions_map[singular_role] = permissions
+
+      # Add magic methods to Clerk::Acount
+      Clerk::Account.class_eval do
+        define_method account_accessor do
+          self.class::RolesWrapper.new(self, account_accessor)
+        end
+
+        define_method :"is_#{singular_role}?" do |*args|
+          has_role?(singular_role, *args)
+        end
+
+        permissions.each do |permission|
+          define_method :"can_#{permission}?" do |*args|
+            has_permission?(permission, *args)
+          end
+        end                        
+      end
+      
+      [
+        association_name.to_sym,
+        through: roles_association, 
+        source: :account
+      ]
+    end
+  end        
+end   

data/config/initializers/patch_persistence.rb

@@ -0,0 +1,41 @@
+::ActiveRecord::Persistence.module_eval do 
+  alias_method :_original_create_record, :_create_record
+
+  def _clerk_create_record(attribute_names = self.attribute_names)
+    attribute_names = attributes_for_create(attribute_names)
+
+    values = attributes_with_values(attribute_names)
+
+    response = self.class.clerk_persistence_api.post(self.class.clerk_persistence_path, values)
+
+    if response.status == 200
+      new_id = JSON.parse(response.body)["id"]
+    elsif response.status == 422
+      response.data.each do |k, vs|
+        vs.each do |v|
+          self.errors.add(k, v)
+        end
+      end
+      raise ActiveRecord::RecordInvalid.new(self)
+    else
+      Rails.logger.fatal "Server Failed: #{response.data[:message]}"
+      raise ActiveRecord::RecordNotSaved.new("Failed to save the server record", self)
+    end
+    
+    self.id ||= new_id if self.class.primary_key
+
+    @new_record = false
+
+    yield(self) if block_given?
+
+    id
+  end
+
+  def _create_record(*args, &block)
+    if defined?(self.class.clerk_persistence_path)
+      _clerk_create_record(*args, &block)
+    else
+      _original_create_record(*args, &block)
+    end
+  end        
+end

data/lib/clerk-rails.rb

@@ -1,4 +1,5 @@
 require "clerk/version"
+require "clerk/api"
 require "clerk/engine"
 require "clerk/id"
 require "faraday"
@@ -6,7 +7,6 @@ require "faraday"
 module Clerk
   class << self
     attr_reader :config
-    attr_reader :api
 
     def configure
       @config = Configuration.new
@@ -27,7 +27,10 @@ module Clerk
     end
 
     def api
-      @conn ||= Clerk::ApiConnection.new 
+      @conn ||= Clerk::Api::Connection.new(
+        (ENV["CLERK_API_PATH"] || "https://accounts.clerkdev.com"),
+        key_secret
+      )
     end
 
     def key
@@ -47,46 +50,6 @@ module Clerk
     end
   end
 
-  class ApiConnection
-    def initialize
-      @c = Faraday.new(:url => (ENV["CLERK_API_PATH"] || "https://clerk-server-prod-test.herokuapp.com")) do |conn|
-        conn.authorization :Bearer, Clerk.key_secret
-        conn.headers['Content-Type'] = 'application/json'
-        conn.adapter Faraday.default_adapter
-      end
-    end
-
-    def post(path, fields, &block)
-      Clerk::ApiResponse.new(@c.post(path, fields.to_json, &block))
-    end
-
-    def patch(path, fields, &block)
-      Clerk::ApiResponse.new(@c.patch(path, fields.to_json, &block))
-    end
-
-    def delete(path, fields, &block)
-      Clerk::ApiResponse.new(@c.delete(path, fields.to_json, &block))
-    end
-
-    def get(*args, &block)
-      Clerk::ApiResponse.new(@c.get(*args, &block))
-    end
-  end
-
-  class ApiResponse
-    def initialize(faraday_response)
-      @res = faraday_response
-    end
-
-    def data
-      JSON.parse(@res.body, symbolize_names: true)
-    end
-
-    def method_missing(m, *args, &block)
-      @res.send(m, *args, &block)
-    end
-  end
-
   class Configuration
     attr_accessor :app_host, :accounts_host, :database_url, :tunnel_key, :environment, :session_mode, :last_account, :cookie_host
   end

data/lib/clerk/api.rb

@@ -0,0 +1,43 @@
+module Clerk
+  module Api
+    class Connection
+      def initialize(url, auth_token)
+        @c = Faraday.new(:url => url) do |conn|
+          conn.authorization :Bearer, auth_token
+          conn.headers['Content-Type'] = 'application/json'
+          conn.adapter Faraday.default_adapter
+        end
+      end
+
+      def post(path, fields, &block)
+        Clerk::Api::Response.new(@c.post(path, fields.to_json, &block))
+      end
+
+      def patch(path, fields, &block)
+        Clerk::Api::Response.new(@c.patch(path, fields.to_json, &block))
+      end
+
+      def delete(path, fields, &block)
+        Clerk::Api::Response.new(@c.delete(path, fields.to_json, &block))
+      end
+
+      def get(*args, &block)
+        Clerk::Api::Response.new(@c.get(*args, &block))
+      end
+    end
+
+    class Response
+      def initialize(faraday_response)
+        @res = faraday_response
+      end
+
+      def data
+        JSON.parse(@res.body, symbolize_names: true)
+      end
+
+      def method_missing(m, *args, &block)
+        @res.send(m, *args, &block)
+      end
+    end
+  end
+end

data/lib/clerk/engine.rb

@@ -15,8 +15,8 @@ module Clerk
         Clerk.configure do |config|
           config.app_host       = config_data[:APP_HOST]
           config.accounts_host  = config_data[:ACCOUNTS_HOST]
-          config.tunnel_key     = config_data[:TUNNEL_KEY]
           config.database_url   = config_data[:DATABASE_URL]
+          config.tunnel_key     = config_data[:TUNNEL_KEY]
         end        
       rescue => e
         raise "Clerk could not be loaded. #{config_data}"
@@ -24,69 +24,8 @@ module Clerk
 
       if defined?(Rails::Server) and Rails.env.development?
         require 'clerk/tunnel'
-        if !Clerk::Tunnel.ready?
-          Clerk::Tunnel.setup!
-        end
         Clerk::Tunnel.start!
       end
     end
-
-    initializer "clerk.load_helpers" do
-      ::ActionController::Base.send :include, Clerk::ApplicationHelper
-      ::ActiveRecord::Base.class_eval do
-
-        def self.clerk(association_name, permissions: [])
-          plural_role = association_name.to_s.pluralize.to_sym
-          singular_role = association_name.to_s.singularize.to_sym
-
-          roles_association = :"clerk_roles_#{association_name}"
-
-          remote_class = self.name
-
-          unless self.respond_to? :clerk_roles
-            self.class_eval do 
-              include Clerk::Clerked
-            end
-          end
-
-          has_many roles_association, 
-            ->{ where(scope_class: remote_class, name: singular_role) }, 
-            class_name: "Clerk::Role", 
-            foreign_key: :scope_id
-
-          plural_role = association_name.to_s.pluralize.to_sym
-          singular_role = association_name.to_s.singularize.to_sym
-
-          account_accessor = self.name.underscore.pluralize.to_sym
-
-          # Add clerk permissions to `self` the associated class
-          self.clerk_permissions_map[singular_role] = permissions
-
-          # Add magic methods to Clerk::Acount
-          Clerk::Account.class_eval do
-            define_method account_accessor do
-              self.class::RolesWrapper.new(self, account_accessor)
-            end
-
-            define_method :"is_#{singular_role}?" do |*args|
-              has_role?(singular_role, *args)
-            end
-
-            permissions.each do |permission|
-              define_method :"can_#{permission}?" do |*args|
-                has_permission?(permission, *args)
-              end
-            end                        
-          end
-          
-          [
-            association_name.to_sym,
-            through: roles_association, 
-            source: :account
-          ]
-        end        
-      end      
-    end
-
   end
 end

data/lib/clerk/tunnel.rb

@@ -36,8 +36,8 @@ module Clerk
     end
 
     def self.setup!
-      setup_crt! unless self.crt_ready?
-      setup_ngrok! unless self.ngrok_ready?
+      setup_crt! unless crt_ready?
+      setup_ngrok! unless ngrok_ready?
       puts "=> [Clerk] Setup done."
     end
 
@@ -145,6 +145,8 @@ module Clerk
     end
 
     def self.start!
+      setup! unless ready?
+
       self.patch_rack_requests
 
       server = ObjectSpace.each_object(Rails::Server).first

data/lib/clerk/version.rb

@@ -1,3 +1,3 @@
 module Clerk
-  VERSION = '0.1.7'
+  VERSION = '0.1.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clerk-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Clerk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-30 00:00:00.000000000 Z
+date: 2019-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -150,8 +150,12 @@ files:
 - app/models/concerns/clerk/clerked.rb
 - app/models/concerns/clerk/errors.rb
 - app/views/layouts/clerk/application.html.erb
+- config/initializers/add_application_helpers.rb
+- config/initializers/add_clerk_roles.rb
+- config/initializers/patch_persistence.rb
 - config/routes.rb
 - lib/clerk-rails.rb
+- lib/clerk/api.rb
 - lib/clerk/engine.rb
 - lib/clerk/id.rb
 - lib/clerk/tunnel.rb