houston-core 0.7.0.beta → 0.7.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0efd9f80386dab4ef09c84d5b11abebf1257f427
-  data.tar.gz: 779925e55cfdd71e82eeb17d6e73c66c68119289
+  metadata.gz: aa625661458dbddde905b7b756187fec26d0d3e9
+  data.tar.gz: c84af6744c354cb36bdc0cf8bd62ae850882eb30
 SHA512:
-  metadata.gz: cf161cfcdaacc94b20552944be87359bf276aad129a84899508264f025d1d881174f15b4d83ff48a530d105d65c7a6ab42b5a1222cee64b63778d307154ffdd1
-  data.tar.gz: c856faa195a025dceb63555e7cef6c85dc49a8ed3abfa2f4f93fd6d7d99097a87b18b2dfef47c7b732dc6738149826187a0ff5dea98504d49e208e34f981a9c0
+  metadata.gz: a88962ab8eb7a3812f8f434ce3f7533a96932fe18508e4b47f4fdf91e401a83b6b2b6f6b075f0875ca324d792f4b5fa65129706ae3c4ab82e7d342b26f2f8a74
+  data.tar.gz: 1bb2c4920241fb70a7152d69cfcafa7d42e26e94c7905b496df4705b458a677ec01c6dc37cc3d13c66feb798a40954437b8a137072e5915256429c6595b26d7f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    houston-core (0.7.0.beta)
+    houston-core (0.7.0.beta2)
       activerecord-import
       activerecord-pluck_in_batches
       addressable (~> 2.3.8)
@@ -199,7 +199,7 @@ GEM
       mime-types (>= 1.16, < 4)
     method_source (0.8.2)
     mime-types (2.99.1)
-    mini_portile2 (2.0.0)
+    mini_portile2 (2.1.0)
     minitest (5.8.4)
     minitest-reporters (1.1.8)
       ansi
@@ -216,8 +216,9 @@ GEM
     net-ldap (0.12.1)
     net-ssh (2.9.4)
     netrc (0.11.0)
-    nokogiri (1.6.7.2)
-      mini_portile2 (~> 2.0.0.rc2)
+    nokogiri (1.6.8)
+      mini_portile2 (~> 2.1.0)
+      pkg-config (~> 1.1.7)
     oauth2 (1.1.0)
       faraday (>= 0.8, < 0.10)
       jwt (~> 1.0, < 1.5.2)
@@ -241,6 +242,7 @@ GEM
       activerecord (>= 3.1)
       activesupport (>= 3.1)
       arel
+    pkg-config (1.1.7)
     premailer (1.8.6)
       css_parser (>= 1.3.6)
       htmlentities (>= 4.0.0)

data/app/concerns/houston/props.rb

@@ -11,9 +11,13 @@ module Houston
 
 
     module ClassMethods
-      def find_by_prop(prop_name, value)
+      def with_prop(prop_name, value)
         Houston::Props.valid_prop_name!(prop_name)
-        result = where(["props->>'#{prop_name}' = ?", value]).limit(1).first
+        where(["props->>? = ?", prop_name, value])
+      end
+
+      def find_by_prop(prop_name, value)
+        result = with_prop(prop_name, value).limit(1).first
 
         if !result && block_given?
           result = yield value

data/app/helpers/navigation_helper.rb

@@ -1,7 +1,7 @@
 module NavigationHelper
 
   def render_navigation(key)
-    renderer = Houston.config.get_navigation_renderer(key)
+    renderer = Houston.get_navigation_renderer(key)
     instance_eval &renderer
   rescue KeyError
     Rails.logger.error "\e[31;1mThere is no navigation renderer named #{key.inspect}\e[0m"
@@ -16,7 +16,7 @@ module NavigationHelper
   end
 
   def render_nav_for_feature(feature)
-    feature = Houston.config.get_project_feature feature
+    feature = Houston.get_project_feature feature
     return unless feature.permitted?(current_ability, current_project)
 
     render_nav_link feature.name, feature.project_path(current_project), icon: feature.icon

data/app/helpers/url_helper.rb

@@ -27,12 +27,12 @@ module UrlHelper
 
 
   def feature_path(project, feature)
-    feature = Houston.config.get_project_feature feature
+    feature = Houston.get_project_feature feature
     feature.project_path project
   end
 
   def link_to_project_feature(project, feature)
-    feature = Houston.config.get_project_feature feature
+    feature = Houston.get_project_feature feature
     link_to feature.name, feature.project_path(project)
   end
 

data/app/views/projects/_form.html.erb

@@ -70,7 +70,7 @@
       <label class="control-label">Features</label>
       <div class="controls" style="padding-top: 5px; padding-bottom: 5px;">
         <% Houston.config.project_features.each do |feature_slug| %>
-          <% feature = Houston.config.get_project_feature(feature_slug) %>
+          <% feature = Houston.get_project_feature(feature_slug) %>
           <label for="selected_features_<%= feature_slug %>">
             <%= check_box_tag "project[selected_features][]", feature_slug, @project.feature?(feature_slug), id: "selected_features_#{feature_slug}", class: "project-feature" %>
             <%= feature.name %>

data/app/views/users/_form.html.erb

@@ -57,7 +57,7 @@
 
 
     <%= f.fields_for :props do |f| %>
-      <% Houston.config.user_options.each do |form| %>
+      <% Houston.user_options.each do |form| %>
         <hr />
 
         <div class="control-group">

data/config/application.rb

@@ -1,10 +1,7 @@
 require File.expand_path("../boot", __FILE__)
 
 require "rails/all"
-
-require_relative "../lib/configuration.rb" # Loads Houston's configuration
-require_relative "../lib/houston_server.rb"
-require_relative "../lib/houston_daemonize.rb"
+require "houston/boot"
 
 # Require gems listed in gemspec
 require "activerecord-import"

data/config/initializers/add_navigation_renderers.rb

@@ -1,10 +1,10 @@
-Houston.config.add_navigation_renderer :sprint do
+Houston.add_navigation_renderer :sprint do
   if can?(:read, Sprint)
     render_nav_link "Sprint", main_app.current_sprint_path, icon: "fa-burndown"
   end
 end
 
-Houston.config.add_navigation_renderer :pulls do
+Houston.add_navigation_renderer :pulls do
   if can?(:read, Github::PullRequest)
     render_nav_link "Pulls", main_app.pulls_path, icon: "octokit-pull-request"
   end
@@ -12,27 +12,27 @@ end
 
 
 
-Houston.config.add_project_feature :ideas do
+Houston.add_project_feature :ideas do
   name "Ideas"
   icon "fa-lightbulb-o"
   path { |project| Houston::Application.routes.url_helpers.project_open_ideas_path(project) }
   ability { |ability, project| ability.can?(:read, project.tickets.build) }
 end
 
-Houston.config.add_project_feature :bugs do
+Houston.add_project_feature :bugs do
   name "Bugs"
   icon "fa-bug"
   path { |project| Houston::Application.routes.url_helpers.project_open_bugs_path(project) }
   ability { |ability, project| ability.can?(:read, project.tickets.build) }
 end
 
-Houston.config.add_project_feature :testing do
+Houston.add_project_feature :testing do
   name "Testing"
   icon "fa-comments"
   path { |project| Houston::Application.routes.url_helpers.project_testing_report_path(project) }
 end
 
-Houston.config.add_project_feature :releases do
+Houston.add_project_feature :releases do
   name "Releases"
   icon "fa-paper-plane"
   path { |project| Houston::Application.routes.url_helpers.releases_path(project) }
@@ -64,7 +64,7 @@ Houston.config.add_project_feature :releases do
 
 end
 
-Houston.config.add_project_feature :settings do
+Houston.add_project_feature :settings do
   name "Settings"
   icon "fa-gear"
   path { |project| Houston::Application.routes.url_helpers.edit_project_path(project) }

data/lib/houston/boot.rb

@@ -0,0 +1,4 @@
+require "houston/boot/configuration"
+require "houston/boot/server"
+require "houston/boot/daemonize"
+require "houston/boot/extensions"

data/lib/{configuration.rb → houston/boot/configuration.rb}

@@ -1,8 +1,8 @@
-root = File.expand_path(File.join(File.dirname(__FILE__), ".."))
+root = File.expand_path(File.join(File.dirname(__FILE__), "../../.."))
 require File.join(root, "lib/core_ext/hash")
 require File.join(root, "lib/core_ext/kernel")
 require File.join(root, "lib/core_ext/exception")
-require File.join(root, "lib/houston_observer")
+require File.join(root, "lib/houston/boot/observer")
 
 $:.unshift File.expand_path(File.join(root, "app/adapters"))
 require "houston/adapters"
@@ -15,9 +15,6 @@ module Houston
       @root = Rails.root
       @modules = []
       @gems = []
-      @navigation_renderers = {}
-      @user_options = {}
-      @available_project_features = {}
       @ticket_types = {}
       @authentication_strategy = :database
       @authentication_strategy_configuration = {}
@@ -124,51 +121,10 @@ module Houston
       @navigation ||= []
     end
 
-    def add_navigation_renderer(name, &block)
-      @navigation_renderers[name] = block
-    end
-
-    def get_navigation_renderer(name)
-      @navigation_renderers.fetch(name)
-    end
-
-
-
-    def add_user_option(slug, &block)
-      dsl = FormBuilderDsl.new
-      dsl.instance_eval(&block)
-      form = dsl.form
-      form.slug = slug
-
-      @user_options[slug] = form
-    end
-
-    def user_options
-      @user_options.values
-    end
-
-
-
     def project_features(*args)
       @project_features = args if args.any?
-      return @available_project_features.keys unless @project_features
-      @project_features & @available_project_features.keys
-    end
-
-    def get_project_feature(slug)
-      @available_project_features[slug]
-    end
-
-    def add_project_feature(slug, &block)
-      dsl = ProjectFeatureDsl.new
-      dsl.instance_eval(&block)
-      feature = dsl.feature
-      feature.slug = slug
-      raise ArgumentError, "Project Feature must supply name, but #{slug.inspect} doesn't" unless feature.name
-      raise ArgumentError, "Project Feature must supply icon, but #{slug.inspect} doesn't" unless feature.icon
-      raise ArgumentError, "Project Feature must supply path lambda, but #{slug.inspect} doesn't" unless feature.path_block
-
-      @available_project_features[slug] = feature
+      return Houston.available_project_features unless @project_features
+      @project_features & Houston.available_project_features
     end
 
 
@@ -429,7 +385,7 @@ module Houston
     end
 
     def method_missing(name, *args, &block)
-      puts "\e[33mMissing Configuration option: #{name}\e[0m"
+      puts "\e[31mMissing Configuration option: \e[1m#{name}\e[0;90m\n#{caller[0]}\e[0m\n\n"
       nil
     end
 
@@ -509,82 +465,7 @@ module Houston
 
 
 
-  class ProjectFeature
-    attr_accessor :name, :slug, :icon, :path_block, :ability_block, :fields
-
-    def initialize
-      self.fields = []
-    end
-
-    def project_path(project)
-      path_block.call project
-    end
-
-    def permitted?(ability, project)
-      return true if ability_block.nil?
-      ability_block.call ability, project
-    end
-  end
-
-
-
-  class ProjectFeatureDsl
-    attr_reader :feature
 
-    def initialize
-      @feature = ProjectFeature.new
-    end
-
-    def name(value)
-      feature.name = value
-    end
-
-    def icon(value)
-      feature.icon = value
-    end
-
-    def path(&block)
-      feature.path_block = block
-    end
-
-    def ability(&block)
-      feature.ability_block = block
-    end
-
-    def field(slug, &block)
-      dsl = FormBuilderDsl.new
-      dsl.instance_eval(&block)
-      form = dsl.form
-      form.slug = slug
-      feature.fields.push form
-    end
-  end
-
-
-
-  class ProjectFeatureForm
-    attr_accessor :slug, :name, :render_block
-
-    def render(view, f)
-      view.instance_exec(f, &render_block).html_safe
-    end
-  end
-
-  class FormBuilderDsl
-    attr_reader :form
-
-    def initialize
-      @form = ProjectFeatureForm.new
-    end
-
-    def name(value)
-      form.name = value
-    end
-
-    def html(&block)
-      form.render_block = block
-    end
-  end
 
 
 

data/lib/houston/boot/extensions.rb

@@ -0,0 +1,136 @@
+module Houston
+  module Extensions
+
+
+
+    def add_navigation_renderer(name, &block)
+      @navigation_renderers[name] = block
+    end
+
+    def get_navigation_renderer(name)
+      @navigation_renderers.fetch(name)
+    end
+
+
+
+    def add_user_option(slug, &block)
+      dsl = FormBuilderDsl.new
+      dsl.instance_eval(&block)
+      form = dsl.form
+      form.slug = slug
+
+      @user_options[slug] = form
+    end
+
+    def user_options
+      @user_options.values
+    end
+
+
+
+    def available_project_features
+      @available_project_features.keys
+    end
+
+    def get_project_feature(slug)
+      @available_project_features[slug]
+    end
+
+    def add_project_feature(slug, &block)
+      dsl = ProjectFeatureDsl.new
+      dsl.instance_eval(&block)
+      feature = dsl.feature
+      feature.slug = slug
+      raise ArgumentError, "Project Feature must supply name, but #{slug.inspect} doesn't" unless feature.name
+      raise ArgumentError, "Project Feature must supply icon, but #{slug.inspect} doesn't" unless feature.icon
+      raise ArgumentError, "Project Feature must supply path lambda, but #{slug.inspect} doesn't" unless feature.path_block
+
+      @available_project_features[slug] = feature
+    end
+
+
+
+  private
+
+    class ProjectFeature
+      attr_accessor :name, :slug, :icon, :path_block, :ability_block, :fields
+
+      def initialize
+        self.fields = []
+      end
+
+      def project_path(project)
+        path_block.call project
+      end
+
+      def permitted?(ability, project)
+        return true if ability_block.nil?
+        ability_block.call ability, project
+      end
+    end
+
+    class ProjectFeatureDsl
+      attr_reader :feature
+
+      def initialize
+        @feature = ProjectFeature.new
+      end
+
+      def name(value)
+        feature.name = value
+      end
+
+      def icon(value)
+        feature.icon = value
+      end
+
+      def path(&block)
+        feature.path_block = block
+      end
+
+      def ability(&block)
+        feature.ability_block = block
+      end
+
+      def field(slug, &block)
+        dsl = FormBuilderDsl.new
+        dsl.instance_eval(&block)
+        form = dsl.form
+        form.slug = slug
+        feature.fields.push form
+      end
+    end
+
+    class ProjectFeatureForm
+      attr_accessor :slug, :name, :render_block
+
+      def render(view, f)
+        view.instance_exec(f, &render_block).html_safe
+      end
+    end
+
+    class FormBuilderDsl
+      attr_reader :form
+
+      def initialize
+        @form = ProjectFeatureForm.new
+      end
+
+      def name(value)
+        form.name = value
+      end
+
+      def html(&block)
+        form.render_block = block
+      end
+    end
+
+  end
+
+
+
+  @navigation_renderers = {}
+  @user_options = {}
+  @available_project_features = {}
+  extend Houston::Extensions
+end

data/lib/houston/version.rb

@@ -1,3 +1,3 @@
 module Houston
-  VERSION = "0.7.0.beta"
+  VERSION = "0.7.0.beta2"
 end

data/lib/tasks/keypair.rake

@@ -1,5 +1,5 @@
 root = File.expand_path(File.join(File.dirname(__FILE__), "../.."))
-require File.join(root, "lib/configuration")
+require File.join(root, "lib/houston/boot/configuration")
 
 namespace :keypair do
   task :generate do |t|
@@ -7,9 +7,9 @@ namespace :keypair do
       puts "#{Houston.config.keypair} exists"
       exit
     end
-    
+
     tmp = Rails.root.to_s
-    
+
     `openssl genrsa -des3 -passout pass:#{Houston.config.passphrase.shellescape} -out #{tmp}/config/private.pem 2048`
     `openssl rsa -in #{tmp}/config/private.pem -passin pass:#{Houston.config.passphrase.shellescape} -out #{tmp}/config/public.pem -outform PEM -pubout`
     `cat #{tmp}/config/private.pem #{tmp}/config/public.pem >> #{Houston.config.keypair}`

data/templates/new-instance/config/main.rb

@@ -135,7 +135,7 @@ Houston.config do
   # Menus are provided by Houston and modules.
   # Additional navigation can be defined by calling
   #
-  #   Houston.config.add_navigation_renderer
+  #   Houston.add_navigation_renderer
   #
   # For examples, see config/initializers/add_navigation_renderers.rb
   #

data/templates/new-module/config/initializers/add_navigation_renderer.rb

@@ -1,3 +1,3 @@
-# Houston.config.add_navigation_renderer :<%= name %> do
+# Houston.add_navigation_renderer :<%= name %> do
 #  render_nav_link "<%= camelized %>", Houston::<%= camelized %>::Engine.routes.url_helpers.root_path, icon: "fa-thumbs-up"
 # end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: houston-core
 version: !ruby/object:Gem::Version
-  version: 0.7.0.beta
+  version: 0.7.0.beta2
 platform: ruby
 authors:
 - Bob Lail
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-25 00:00:00.000000000 Z
+date: 2016-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -1409,7 +1409,6 @@ files:
 - db/seeds.rb
 - db/structure.sql
 - houston-core.gemspec
-- lib/configuration.rb
 - lib/core_ext/array.rb
 - lib/core_ext/duration.rb
 - lib/core_ext/exception.rb
@@ -1418,11 +1417,14 @@ files:
 - lib/generators/instance_generator.rb
 - lib/generators/module_generator.rb
 - lib/houston/application.rb
+- lib/houston/boot.rb
+- lib/houston/boot/configuration.rb
+- lib/houston/boot/daemonize.rb
+- lib/houston/boot/extensions.rb
+- lib/houston/boot/observer.rb
+- lib/houston/boot/server.rb
 - lib/houston/cli.rb
 - lib/houston/version.rb
-- lib/houston_daemonize.rb
-- lib/houston_observer.rb
-- lib/houston_server.rb
 - lib/parallel_enumerable.rb
 - lib/rack/oembed.rb
 - lib/tasks/.gitkeep