brief 1.9.8 → 1.9.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e9d4f96cdfb13d6e754b942a4687f60e7d8888e
-  data.tar.gz: 59caee15c35018c1b1bfebcec9bc2c9455fdc41a
+  metadata.gz: 1e5778cd99dfcb00c4420b4fedfb0e4e69b61d0b
+  data.tar.gz: 1c551d49bf311134309dcff740d1492200deeea2
 SHA512:
-  metadata.gz: 9bddeba5d8229e39e3fb5e7d939ae57b2104862fd26d5d2f737404a965af4ba30bed1fa272937b2f814b793174fff0a082b6ab4c7bbb301d8726539628296acc
-  data.tar.gz: 48af2ae16f06cef85620f6fe59c9f184748e2ffadb529645900be9da06f36db071174d1cfe8f79abb33f6fa0bb56ac194433823a770631b51505cc6161b5cbf7
+  metadata.gz: d23643282699bf917fb20805a229e82138abe51babef4454e137f90802ef3786d4d6b8ff61661a77b368a363fbf5b21d6871002e76d7b479458409111b7a4edd
+  data.tar.gz: 861e4cc4df911860dcc481bd3e25d208f815f3f3ce078d05ae515e0d07408c71559c309d6cfb69cb898b613b150a2fd2fe18f4c7b3574bb495be70ec575e9808

data/.ruby-version

@@ -0,0 +1 @@
+2.2.0

data/Gemfile.lock

@@ -32,8 +32,8 @@ GEM
     coderay (1.1.0)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
-    commander (4.3.2)
-      highline (~> 1.7.1)
+    commander (4.3.3)
+      highline (~> 1.7.2)
     daemons (1.2.2)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
@@ -51,7 +51,7 @@ GEM
       rack
     github-markdown (0.6.8)
     hashie (2.1.2)
-    highline (1.7.1)
+    highline (1.7.2)
     hike (2.1.3)
     http_parser.rb (0.6.0)
     i18n (0.7.0)
@@ -60,7 +60,7 @@ GEM
     json (1.8.2)
     method_source (0.8.2)
     mini_portile (0.6.2)
-    minitest (5.5.1)
+    minitest (5.6.1)
     multipart-post (2.0.0)
     nokogiri (1.6.5)
       mini_portile (~> 0.6.0)

data/REFACTOR.md

@@ -0,0 +1,4 @@
+- `YAML.load_file(file)` will load frontmatter and discard the rest
+- `File.basename(file, '.*')` gets the basename with no extensions
+- Merge document and model classes
+- Use ActiveModel

data/Rakefile

@@ -2,9 +2,6 @@ Dir[File.join(Dir.pwd, 'tasks', '**', '*.rb')].each { |f| require f }
 Dir[File.join(Dir.pwd, 'tasks', '*.rake')].each { |f| load f }
 
 require "bundler/gem_tasks"
-require 'rspec/core/rake_task'
-
-RSpec::Core::RakeTask.new(:spec)
 
 Distribution.configure do |config|
   config.package_name = 'brief'
@@ -24,5 +21,3 @@ Distribution.configure do |config|
     'unf_ext-0.0.6'
   ]
 end
-
-task :default => :spec

data/bin/brief

@@ -18,6 +18,8 @@ if ARGV[0] == "console"
   Pry.start($briefcase)
 else
   require 'commander/import'
+  
+  $terminal.wrap_at = 120
 
   program :name, "Brief"
   program :description, "Brief lets you treat your markdown files like active record objects"

data/lib/brief/briefcase.rb

@@ -58,7 +58,12 @@ module Brief
         key: folder_name.to_s.parameterize,
         name: folder_name.to_s.titlecase,
         settings: settings,
-        cache_key: cache_key
+        cache_key: cache_key,
+        root: root.to_s,
+        docs_path: docs_path.to_s,
+        assets_path: assets_path.to_s,
+        models_path: models_path.to_s,
+        data_path: data_path.to_s
       }
 
       if params[:include_data] || params[:data]
@@ -87,7 +92,11 @@ module Brief
     end
 
     def as_full_export(options={})
-      options.reverse_merge!(content: true, rendered: true, models: true, schema: true)
+      options.reverse_merge!(content: true,
+                             rendered: true,
+                             models: true,
+                             schema: true,
+                             attachments: true)
       as_default(options)
     end
 

data/lib/brief/cli/export.rb

@@ -34,19 +34,6 @@ command 'dispatch export' do |c|
                                              data: options.include_data,
                                              attachments: options.include_attachments,
                                              models: options.include_models).as_json
-
-      case
-      when options.output && options.format.to_sym == :json
-        Pathname(options.output).open("w+") do |fh|
-          fh.write("#{options.prefix_output}#{result.to_json}")
-        end
-      when options.format.to_sym == :json
-        puts "#{options.prefix_output}#{result.to_json}"
-      when options.format.to_sym == :printed
-        puts result
-      end
-
-
   end
 end
 

data/lib/brief/cli/server.rb

@@ -12,27 +12,20 @@ command 'start gateway server' do |c|
   end
 end
 
-command 'start drb server' do |c|
-  c.option '--host HOSTNAME', String, 'What hostname to listen on'
+command 'start socket server' do |c|
   c.option '--port PORT', String, 'What port to listen on'
-  c.option '--gateway', 'Create a gateway instead of a briefcase'
 
   c.action do |args, options|
-    options.default(root: Brief.pwd)
+    options.default(root: Brief.pwd, port: 5054)
 
-    require 'drb'
+    require 'brief/server/socket'
+    require 'em-websocket'
 
-    root = Pathname(options.root)
 
-    object = if options.gateway
-               Brief::Server::Distributed.new(root: root, briefcase_options: {eager: true})
-             else
-               Brief::Briefcase.new(root: root, eager: true)
-             end
-
-    puts "== starting distributed service"
-    DRb.start_service "druby://:#{ options.port || 9000 }", object
-    trap("INT") { DRb.stop_service }
-    DRb.thread.join()
+    EM.run {
+      EM::WebSocket.run(:host=>"0.0.0.0",:port => 8089) do |ws|
+        Brief::Server::Socket.new(root: options.root, websocket: ws)
+      end
+    }
   end
 end

data/lib/brief/document.rb

@@ -127,7 +127,7 @@ module Brief
     end
 
     def briefcase
-      (@briefcase_root && Brief.cases[@briefcase_root]) || Brief.case(true)
+      (@briefcase_root && Brief.cases[@briefcase_root.basename.to_s]) || Brief.case(true)
     end
 
     def has_sections?

data/lib/brief/server/socket.rb

@@ -0,0 +1,122 @@
+module Brief class Server
+    class Socket
+      attr_reader :briefcases, :root, :websocket
+
+      def initialize(options={})
+        @root = Pathname(options.fetch(:root))
+        @websocket = options.fetch(:websocket)
+        @briefcases = {}.to_mash
+        @briefcase_options = options.fetch(:briefcase_options, {})
+        load_briefcases
+        setup_interface
+      end
+
+      def process(message={})
+        message.symbolize_keys!
+
+        action      = message.fetch(:action)
+        message_id  = message.fetch(:message_id)
+
+        case
+
+        when action == "brief:info"
+          respond_to(message_id) do
+            {
+              environment: Brief.environment_info,
+              root: root.to_s,
+              briefcases: briefcases.keys
+            }
+          end
+
+        when action == "list:briefcases"
+          presenter = message.fetch(:presenter, 'default')
+          options = message.fetch(:options, {})
+
+          respond_to(message_id) do
+            briefcases.values.map do |bc|
+              bc.present(presenter, options)
+            end
+          end
+
+        when action == "view:briefcase"
+          presenter = message.fetch(:presenter, 'default')
+          options = message.fetch(:options, {})
+          briefcase = briefcases.fetch(message[:briefcase])
+
+          respond_to(message_id) do
+            briefcase.present(presenter.to_sym, options)
+          end
+
+        when action == "view:document"
+          options = message.fetch(:options, {})
+          path = message.fetch(:path)
+          briefcase = briefcases.fetch(message[:briefcase])
+
+          respond_to(message_id) do
+            document = briefcase.document_at(path)
+            document.to_model.as_json(options)
+          end
+
+        when action == "query"
+          params = message.fetch(:params, {})
+          model_options = message.fetch(:model_options, {})
+          briefcase = briefcases.fetch(message[:briefcase])
+
+          respond_to(message_id) do
+            briefcase.where(params).all.map do |model|
+              model.as_json(model_options)
+            end
+          end
+
+        else
+          respond_to(message_id) do
+            {error:"Invalid Action: #{ action }"}
+          end
+        end
+      rescue
+        nil
+      end
+
+      def respond_to(message_id, &block)
+        body = block.call()
+
+        payload = {
+          action: "response",
+          message_id: message_id,
+          body: body
+        }
+
+        websocket.send(payload.to_json)
+      end
+
+      private
+
+      def setup_interface
+        socket = self
+
+        websocket.onmessage do |raw|
+          message = (JSON.parse(raw) rescue nil)
+
+          puts "== Received Message: #{message}"
+          socket.process(message)
+        end
+      end
+
+      def briefcase_options
+        (@briefcase_options || {})
+      end
+
+      def load_briefcases
+        config_path = briefcase_options.fetch(:config_path, "brief.rb")
+
+        root.children.select(&:directory?).each do |dir|
+          if dir.join(config_path).exist?
+            slug = dir.basename.to_s.parameterize
+            @briefcases[slug] ||= Brief::Briefcase.new(briefcase_options.merge(root: dir))
+          end
+        end
+      end
+
+    end
+  end
+end

data/lib/brief/version.rb

@@ -1,3 +1,3 @@
 module Brief
-  VERSION = '1.9.8'
+  VERSION = '1.9.9'
 end

data/lib/brief.rb

@@ -43,6 +43,17 @@ module Brief
     @views ||= {}
   end
 
+  def self.environment_info
+    {
+      VERSION: Brief::VERSION,
+      lib_root: Brief.lib_root.to_s,
+      apps: {
+        search_paths: Brief::Apps.search_paths.map(&:to_s),
+        available: Brief::Apps.available_apps
+      }
+    }
+  end
+
   def self.configuration
     Brief::Configuration.instance
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brief
 version: !ruby/object:Gem::Version
-  version: 1.9.8
+  version: 1.9.9
 platform: ruby
 authors:
 - Jonathan Soeder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-03 00:00:00.000000000 Z
+date: 2015-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -278,12 +278,14 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".ruby-version"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
 - README.md
+- REFACTOR.md
 - Rakefile
 - TUTORIAL.md
 - apps/blueprint/config.rb
@@ -353,6 +355,7 @@ files:
 - lib/brief/server/handlers/schema.rb
 - lib/brief/server/handlers/show.rb
 - lib/brief/server/route.rb
+- lib/brief/server/socket.rb
 - lib/brief/util.rb
 - lib/brief/version.rb
 - packaging/wrapper.sh
@@ -446,7 +449,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Brief makes writing more powerful