catalyst-rails 0.0.9 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0d65247f97e19b2d6535248e8396850700204b4e0d607148532ef90097c5c2d
-  data.tar.gz: 4bbb24b41713f1027ca20c2b0bd9f7aa23e8043bcfb12d13597dc2735bcc7d1f
+  metadata.gz: b0345647f1600899692a28f86ba64bee05a2adae74642c6811ea4407749ed2c7
+  data.tar.gz: 6216abe9d5636d97d68b85dea0748799bf6eaa8f81335fb81c83b0573fb4cfe8
 SHA512:
-  metadata.gz: 7aaef005bfa1705c4e801425f0be77f0235aee7bc9fa1d81affbeb722b33880ee299473775261fb7981500a42cfaf7053b22f104b4a8b9c88b233cde44acbf12
-  data.tar.gz: c22f77a41573433610b10c4884c51bf17586cd7723e47dc613299f31f3121e72cdfbe780d9277e7b56c2fa2765f712acbd7672a83aaa3cbfbba7ecfe6149a55c
+  metadata.gz: 0b1fe8900c64bb2a5897cfce78276fbb2bec7f4a0b53d380161a6393566565e33129b1cd62552ac99e9e40b1f9c2f86fff6ec9e8d6dd138554acd7182eb35de0
+  data.tar.gz: 624c6253b5e8e6e0249e3529244fd2bd5b116cb5971dfb9baf31a82f4cbf32ca4dfecb30d97f4169ce58b9a2f6ceba12430b595191be9677e1e5f58b884d14ec

data/lib/catalyst-rails.rb

@@ -18,7 +18,6 @@ module Catalyst
 
   setting :environment, default_environment
   setting :manifest_path, default_manifest_path
-  setting :assets_base_path, '/assets'
   setting :assets_host, ENV.fetch('HOST') { nil }
   setting :assets_host_protocol, 'https'
   setting :dev_server_host, ENV.fetch('DEV_SERVER_HOST') { 'localhost' }

data/lib/catalyst/builder.rb

@@ -81,9 +81,11 @@ module Catalyst
     end
 
     def asset_paths
-      if ::Catalyst::Config.root_path
-        Dir.glob(File.join(::Catalyst::Config.root_path, '**/*.{js,ts,tsx,scss}')) + [
-          File.join(Dir.pwd, 'yarn.lock')
+      if ::Catalyst::Config.context_path
+        Dir.glob(File.join(::Catalyst::Config.context_path, '**/*.{js,ts,tsx,scss}')) + [
+          File.join(Dir.pwd, 'package.json'),
+          File.join(Dir.pwd, 'yarn.lock'),
+          File.join(Dir.pwd, 'catalyst.config.json')
         ]
       else
         []

data/lib/catalyst/config.rb

@@ -7,23 +7,26 @@ require_relative './errors'
 
 module Catalyst
   class Config
+    CATALYST_CONFIG_PATH = File.expand_path('./catalyst.config.json', Dir.pwd)
     PACKAGE_PATH = File.expand_path('./package.json', Dir.pwd)
 
     include Singleton
 
     class << self
       extend Forwardable
-      def_delegators :instance, :root_path, :build_path
+      def_delegators :instance, :context_path
     end
 
     def initialize
-      unless File.exists?(PACKAGE_PATH)
+      @values = if File.exists?(CATALYST_CONFIG_PATH)
+        JSON.parse(File.read(CATALYST_CONFIG_PATH))
+      elsif File.exists?(PACKAGE_PATH)
+        JSON.parse(File.read(PACKAGE_PATH))['catalyst']
+      else
         raise ::Catalyst::MissingConfig,
-              "Missing package.json file in: #{Dir.pwd}"
+              "Missing 'catalyst.config.json' or 'package.json' file in: #{Dir.pwd}"
       end
 
-      @values = JSON.parse(File.read(PACKAGE_PATH))['catalyst']
-
       if @values.nil?
         raise ::Catalyst::MissingConfig, <<~MESSAGE
           Missing "catalyst" config in package.json file.
@@ -33,12 +36,8 @@ module Catalyst
       end
     end
 
-    def root_path
-      File.join(Dir.pwd, @values['rootPath'])
-    end
-
-    def build_path
-      File.join(Dir.pwd, @values['buildPath'])
+    def context_path
+      File.join(Dir.pwd, @values['contextPath'] || @values['rootPath'])
     end
   end
 end

data/lib/catalyst/manifest.rb

@@ -57,13 +57,7 @@ module Catalyst
         return "http://#{dev_server_host}:#{dev_server_port}/#{path}"
       else
         if @manifest.key?(path)
-          assets_base_path = Catalyst.config.assets_base_path
-
-          if assets_base_path.nil?
-            return @manifest[path]
-          end
-
-          return "#{assets_base_path}/#{@manifest[path]}"
+          return @manifest[path]
         else
           raise AssetMissing, "Couldn't find an asset for path: #{path}"
         end

data/lib/catalyst/version.rb

@@ -2,6 +2,6 @@
 
 module Catalyst
   def self.version
-    Gem::Version.new('0.0.9')
+    Gem::Version.new('0.1.0')
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: catalyst-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors:
 - Dan Martens
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-24 00:00:00.000000000 Z
+date: 2019-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-configurable
@@ -79,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Ruby helpers for the "catalyst" node package