fragmentary 0.2.2 → 0.4.0

data/lib/fragmentary/subscription.rb

@@ -44,7 +44,7 @@ module Fragmentary
     end
 
     include ActiveSupport::Callbacks
-    define_callbacks :after_destroy
+    define_callbacks :after_create, :after_destroy
 
     attr_reader :subscriber
     attr_accessor :record
@@ -55,7 +55,10 @@ module Fragmentary
     end
 
     def after_create(record)
-      call_method(:"create_#{record.class.model_name.param_key}_successful", record)
+      run_callbacks :after_create do
+        @record = record
+        call_method(:"create_#{record.class.model_name.param_key}_successful", record)
+      end
     end
 
     def after_update(record)

data/lib/fragmentary/user_session.rb

@@ -1,38 +1,66 @@
 require 'rails/console/app'
+require 'http'
+require 'nokogiri'
 
 module Fragmentary
 
-  class UserSession
+  class InternalUserSession
 
     include Rails::ConsoleMethods
 
-    def initialize(user, &block)
+    def initialize(target, user=nil, &block)
       # app is from Rails::ConsoleMethods. It returns an object ActionDispatch::Integration::Session.new(Rails.application)
       # with some extensions. See https://github.com/rails/rails/blob/master/railties/lib/rails/console/app.rb
       # The session object has instance methods get, post etc.
       # See https://github.com/rails/rails/blob/master/actionpack/lib/action_dispatch/testing/integration.rb
       @session = app
-      sign_in if @credentials = session_credentials(user)
+      @user = user
+      @target = URI.parse(target)
+      @session.host! session_host
+      sign_in if session_credentials
       instance_eval(&block) if block_given?
     end
 
-    def session_credentials(user)
-      credentials = user.try(:credentials)
-      credentials.is_a?(Proc) ? credentials.call : credentials
+    def session_host
+      @session_host ||= @target.host + ((port=@target.port) ? ":#{port}" : "")
     end
 
-    def method_missing(method, *args)
-      @session.send(method, *args)
+    def session_sign_in_path
+      @sign_in_path ||= Fragmentary.config.get_sign_in_path
     end
 
-    def sign_out
-      post Fragmentary.config.sign_out_path, {:_method => 'delete', :authenticity_token => request.session[:_csrf_token]}
+    def session_sign_out_path
+      @sign_out_path ||= Fragmentary.config.sign_out_path
+    end
+
+    def session_credentials
+      return nil unless @user
+      @credentials ||= begin
+        credentials = @user.credentials
+        credentials.is_a?(Proc) ? credentials.call : credentials
+      end
+    end
+
+    def relative_url_root
+      @relative_url_root ||= Rails.application.config.relative_url_root
+    end
+
+    def session_options
+      @session_options ||= relative_url_root ? {:env => {'SCRIPT_NAME' => relative_url_root}} : {}
+    end
+
+    def method_missing(method, *args)
+      @session.send(method, *args)
     end
 
     def sign_in
-      get Fragmentary.config.get_sign_in_path  # necessary in order to get the csrf token
+      raise "Can't sign in without user credentials" unless session_credentials
+      send_request(:method => :get, :path => session_sign_in_path, :options => session_options)  # necessary in order to get the csrf token
       # NOTE: In Rails 5, params is changed to a named argument, i.e. :params => {...}. Will need to be changed.
-      post Fragmentary.config.post_sign_in_path, @credentials.merge(:authenticity_token => request.session[:_csrf_token])
+      # Note that request is called on session, returning an ActionDispatch::Request; request.session is an ActionDispatch::Request::Session
+      puts "      * Signing in as #{session_credentials.inspect}"
+      parameters = session_credentials.merge(:authenticity_token => request.session[:_csrf_token])
+      send_request(:method => :post, :path => session_sign_in_path, :parameters => parameters, :options => session_options)
       if @session.redirect?
         follow_redirect!
       else
@@ -40,39 +68,89 @@ module Fragmentary
       end
     end
 
-  end
+    def follow_redirect!
+      raise "not a redirect! #{status} #{status_message}" unless redirect?
+      if (url = response.location) =~ %r{://}
+        destination = URI.parse(url)
+        path = destination.query ? "#{destination.path}?#{destination.query}" : destination.path
+      end
+      path = relative_url_root ? path.gsub(Regexp.new("^#{relative_url_root}"), "") : path
+      send_request(:method => :get, :path => path, :options => session_options)
+      status
+    end
 
-  class SessionUser
+    def send_request(method:, path:, parameters: nil, options: {})
+      options.merge!({:params => parameters})
+      options.merge!(session_options)
+      if options.try(:[], :xhr)
+        puts "      * Sending xhr request '#{method.to_s} #{path}'" + (!parameters.nil? ? " with #{parameters.inspect}" : "")
+        Rails.logger.info "      * Sending xhr request '#{method.to_s} #{path}'" + (!parameters.nil? ? " with #{parameters.inspect}" : "")
+      else
+        puts "      * Sending request '#{method.to_s} #{path}'" + (!parameters.nil? ? " with #{parameters.inspect}" : "")
+        Rails.logger.info "      * Sending request '#{method.to_s} #{path}'" + (!parameters.nil? ? " with #{parameters.inspect}" : "")
+      end
+      @session.send(method, path, options)
+    end
 
-    def self.all
-      @@all ||= Hash.new
+    def sign_out
+      # request is called on session, returning an ActionDispatch::Request; request.session is an ActionDispatch::Request::Session
+      parameters = {:_method => 'delete', :authenticity_token => request.session[:_csrf_token]}
+      send_request(:method => :post, :path => session_sign_out_path, :parameters => parameters, :options => session_options)
     end
 
-    def self.fetch(key)
-      all[key]
+  end
+
+  class ExternalUserSession
+
+    def initialize(target, user=nil)
+      @target = URI.parse(target)
+      @relative_url_root = @target.path
+      @session = HTTP.persistent(target)
+      @cookie = nil
+      @authenticity_token = nil
+      sign_in if @credentials = session_credentials(user)
     end
 
-    def initialize(user_type, options={})
-      if user = self.class.fetch(user_type)
-        if user.options != options
-          raise RangeError, "You can't redefine an existing SessionUser object: #{user_type.inspect}"
-        else
-          user
-        end
+    def send_request(method:, path:, parameters: nil, options: {})
+      if options.try(:[], :xhr)
+        Rails.logger.info "      * Sending xhr request '#{method.to_s} #{path}'" + (!parameters.nil? ? " with #{parameters.inspect}" : "")
       else
-        @user_type = user_type
-        @options = options
-        self.class.all.merge!({user_type => self})
+        Rails.logger.info "      * Sending request '#{method.to_s} #{path}'" + (!parameters.nil? ? " with #{parameters.inspect}" : "")
       end
+      unless path =~ %r{://}
+        path = @relative_url_root + path
+      end
+      cookies = @cookie ? {@cookie.name.to_sym => @cookie.value} : {}
+      headers = options.try(:delete, :headers) || {}
+      headers.merge!({:'X-Requested-With' => 'XMLHttpRequest'}) if options.try(:delete, :xhr)
+      response = @session.cookies(cookies).headers(headers).send(method, path, {:json => parameters})
+      @cookie = response.cookies.first
+      @authenticity_token = Nokogiri::HTML.parse(response.to_s).css('head meta[name="csrf-token"]').first.try(:[], 'content')
+      if (response.code >=300) && (response.code <=399)
+        location = response.headers[:location]
+        options = {:headers => {:accept => "text/html,application/xhtml+xml,application/xml"}}
+        response = send_request(:method => :get, :path => location, :parameters => nil, :options => options)
+      end
+      response
     end
 
-    def credentials
-      options[:credentials]
+    def session_credentials(user)
+      credentials = user.try(:credentials)
+      credentials.is_a?(Proc) ? credentials.call : credentials
     end
 
-    protected
-    def options
-      @options
+    def sign_in
+      # The first request retrieves the authentication token
+      response = send_request(:method => :get, :path => Fragmentary.config.get_sign_in_path)
+      puts "      * Signing in as #{@credentials.inspect}"
+      response = send_request(:method => :post, :path => Fragmentary.config.post_sign_in_path,
+                              :parameters => @credentials.merge(:authenticity_token => @authenticity_token),
+                              :options => {:headers => {:accept => "text/html,application/xhtml+xml,application/xml"}})
+    end
+
+    def sign_out
+      send_request(:method => :delete, :path => Fragmentary.config.sign_out_path, :parameters => {:authenticity_token => @authenticity_token})
+      @session.close
     end
   end
 

data/lib/fragmentary/version.rb

@@ -1,3 +1,3 @@
 module Fragmentary
-  VERSION = "0.2.2"
+  VERSION = "0.4.0"
 end

data/lib/fragmentary.rb

@@ -7,9 +7,12 @@ require 'fragmentary/request'
 require 'fragmentary/fragment'
 require 'fragmentary/handler'
 require 'fragmentary/user_session'
+require 'fragmentary/session_user'
 require 'fragmentary/widget_parser'
 require 'fragmentary/widget'
 require 'fragmentary/publisher'
+require 'fragmentary/jobs/send_requests_job'
+require 'fragmentary/jobs/dispatch_handlers_job'
 
 module Fragmentary
   def self.config
@@ -18,4 +21,12 @@ module Fragmentary
     @config
   end
   class << self; alias setup config; end
+
+  def self.application
+    Rails.application
+  end
+
+  def self.application_root_url
+    application.routes.url_helpers.root_url
+  end
 end

metadata

@@ -1,63 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: fragmentary
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Mark Thomson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-02 00:00:00.000000000 Z
+date: 2023-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.0.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.0.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
-  name: delayed_job_active_record
+  name: wisper-activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: wisper-activerecord
+  name: http
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -120,13 +128,17 @@ files:
 - fragmentary.gemspec
 - lib/fragmentary.rb
 - lib/fragmentary/config.rb
-- lib/fragmentary/dispatcher.rb
 - lib/fragmentary/fragment.rb
 - lib/fragmentary/fragments_helper.rb
 - lib/fragmentary/handler.rb
+- lib/fragmentary/jobs/dispatch_handlers_job.rb
+- lib/fragmentary/jobs/send_requests_job.rb
 - lib/fragmentary/publisher.rb
 - lib/fragmentary/request.rb
 - lib/fragmentary/request_queue.rb
+- lib/fragmentary/serializers/handler_serializer.rb
+- lib/fragmentary/serializers/request_queue_serializer.rb
+- lib/fragmentary/session_user.rb
 - lib/fragmentary/subscriber.rb
 - lib/fragmentary/subscription.rb
 - lib/fragmentary/user_session.rb
@@ -152,8 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 3.0.9
 signing_key: 
 specification_version: 4
 summary: Fragment modeling and caching for Rails