lurker 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 283e1232ba94b0709c578cd9079df7752d246771
-  data.tar.gz: 052b2c171edb907e97c14d33c0e06825525714fc
+  metadata.gz: 96e03cec0753864d2fba1831cef5a23e4e8f7ee6
+  data.tar.gz: 2c774884cdfceaab040541bf62587408186b3f8b
 SHA512:
-  metadata.gz: ef36571fc15bc8b40b083f915a14ce602db250e8ff8d1bdace6d89da88c98a537fec81ced6a3db3cb599044e3a5f93f380a9f695874e4439e7cb4b5792484eb0
-  data.tar.gz: 91fd578c50783ff3f4125e6a2f31bc562054c401bec74698409ce0ede15b7f524a8ee51edfa9a2c7a7c90dcd55af6238d73b363f1dbafcaac7f71deb6b7786bf
+  metadata.gz: 674d6b9eb0f82ed400c16dc63b251dc2640b75b5cefcc796f3bcf8053a8e5ddafa8b538d3dec7bda67bdd0b9e7463269ffcf7c0f022015f80eb7fb4aad1d83e6
+  data.tar.gz: 161d9b376e1e6a8c3497877655677ed97478be2fcc711af971c166a8c8d64f4c31c2bbb4015f6c01c40de5a204c55750a1d7b83a9841044dba5112ff8d914105

checksums.yaml.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG v1
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABCgAGBQJTXvK5AAoJENcoxKfNVdjb5RoIAMetNDxFZ6KmLPkDpq50xeUt
-HZri9cCVeD+5zk2SqIGTzh8jI1pqg822e1gFOyPpkZaXMUKisA0Lbogc2EWjsjte
-HRjmH+ZL16VqFMhDFBoCX9Q1yXPm4wWhVcKK23fCbnY0x5HY2uHMUim8yDAN2bUO
-/X7KIkNAwMLcihR1sHg8vCkmRWpN+29qaAvAOjjiyLyiND+Z7doweWNVrvxIF5Ei
-L1jqEQouA+yXpSXtxYr4T+uQmwQCuL8TxDDm6EzMF8TuQFhLV2BwE2l8fQ5ZTtWq
-qbysZqac/GxHz47at7+d1ghokp+jQ8uNt90vvNlo+ISfNOCHdP5jMEVTt6m1+HI=
-=77ha
+iQEcBAABCgAGBQJTYSdKAAoJENcoxKfNVdjbUYAH+wVE2NmE7ol3wWjmxHMRAyr5
+Gc9vxOmbMPi70Cqf6IEC4L9pzn9Yy+qTDGjC98KolSDoULKKuvOn920eOJ1JOM5y
+YjV0pke1UF/ohX8edCK6KT4vt3pgoC++65ZNaYvAEBJGjo7ImDIM6yD17RCOrr39
+EhYFc3kMa403nnBK+XFYzhdeXFgI2f9yz8mOBlyKs009trRACih/vEJjrvWZtaKM
+StbjHXL/1hMGzTkvJHYxg6EvoegUarMxuKfq0CsY9gvJVp/bg5egItI12jgiYeGn
+Ucs//BpVz7uLaKDSmNi80s71pr3RRzZC4rBwnnR2Cp4BwQ5oa4GgqET6vAB4Pmc=
+=d8yD
 -----END PGP SIGNATURE-----

data.tar.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG v1
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABCgAGBQJTXvK2AAoJENcoxKfNVdjbkmkIAJPPUMpXPntfkoEtTB4WAgo7
-kFQwMJD5Lrz10tLwf7o8pkZWOEOMmHbZW46v2iLzgEXoXoBF5IOO8hBW0UmplWcK
-s9Jx8ws2BrMt21qI48qYHDLHmn+Wexjvj/pV5X31JgfilzW9BhgV7MSfS//RmDkv
-t5NCGdg84AJidKMGL95r4gxn7Uxp6q7oMZQONx9oaqXTAqLu7x9iuXTH1B3+1gNc
-vJq+By9GseQ+I/TEPkz1wllWM3adMWH2a9iMqCys8DWw13Dpam8xnLRdEO+ZVJSy
-hs2rVOKcGfEFEfI3gbwnd6VI7ItVxnFRlumNlEZ/V3ZkNANNQq+PEgOMBdasbgI=
-=9S7g
+iQEcBAABCgAGBQJTYSdHAAoJENcoxKfNVdjbaXcH/0EznB410jliY+1FsQNauGfW
+0KrnVLUPNrouYI/LPJ43XCRDEXo4VG9zI741o3RDPCamLi64nRO6bOmh3OoEYBTJ
+y+NE9h90zMJ4XtiBglNhMxo2OZz3C7DSw9ragA6+9VwCuhQUrYoSQ+X15YQXE1iE
+sczxQ+qGAg52sXoYnYydi7Ip/kPWWVZV4P4DbUZmf5LYNDOY7rzWGKrTJcKhaThy
+N5J3g+hWlap2v5bxP03G0xz+GF7K1ytWh5DZw8zT7p6P4Oo8aq1s7m+fCFcohEI3
+u1LNQrhXxloiSjq4tnibSZPmiyYPZmD4xx6tchE8ZnyLZ8ErX4EimDFxoP/Q9Bk=
+=T/zF
 -----END PGP SIGNATURE-----

data/.travis.yml

@@ -7,8 +7,4 @@ cache:
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.0
-matrix:
-  allow_failures:
-    - rvm: 1.9.3
-    - rvm: 2.0.0
+  - 2.1.1

data/README.md

@@ -46,7 +46,8 @@ and it fails if your code changes the api!
       - The property '#/user/last_sign_in_at' of type String did not match the following type:
         null in schema file:///.../lurker/api/v1/users-POST.json.yml#
 
-Let's run your `rails s` and visit [http://localhost:3000/lurker/](http://localhost:3000/lurker/) (or see [demo][demo_app])
+Let's run your `rails s` and visit [http://localhost:3000/lurker/](http://localhost:3000/lurker/)
+(or see [demo][demo_app2] for example)
 
 Now, you can test your API on-line (for real)
 
@@ -75,7 +76,7 @@ Now, you can test your API on-line (for real)
     # e.g. config/environtents/staging.rb
     config.middleware.use Lurker::Sandbox
 
-E.g. demo application runs with it: when creating, updating repos or users
+E.g. demo application on Heroku runs with it: when creating, updating repos or users
 ids getting increased, but if you look into GET #index,
 new items are NOT showing up. **This is NOT a bug!** - sequences in postgres
 are increasing notwithstanding ROLLBACK is called. As such:
@@ -88,7 +89,7 @@ are increasing notwithstanding ROLLBACK is called. As such:
 
 You can clone the repo & run `rake build_example_docs`.
 It will generate testing rails application under `tmp/lurker_app`.
-Currently it is deployed [here][demo_app].
+Currently it is deployed [here][demo_app] within sandbox mode and [here][demo_app2].
 
 
 ## Contributions
@@ -151,8 +152,9 @@ Also thanks to [React.js][reactjs] for two-way binding.
 [partial_example]: https://www.relishapp.com/razum2um/lurker/docs/docs-generation/partials
 [partial_example_demo]: http://lurker-app.herokuapp.com/lurker/api/v1/users/__user_id/repos-POST.html
 [evil_martians]: http://evilmartians.com/
-[demo_app]: http://lurker-app.herokuapp.com/lurker/
-[demo_live]: http://lurker-app.herokuapp.com/lurker/api/v1/users-POST.html
+[demo_app]: http://lurker-app.herokuapp.com
+[demo_app2]: http://lurker.razum2um.me
+[demo_live]: http://lurker.razum2um.me/lurker/api/v1/users-POST.html
 
 [Gem Version]: https://rubygems.org/gems/lurker
 [Build Status]: https://travis-ci.org/razum2um/lurker

data/features/support/env.rb

@@ -43,5 +43,8 @@ end
 
 After do |scenario|
   DatabaseCleaner.clean
+end
+
+After('@selenium') do |scenario|
   save_and_open_page if scenario.failed? && !ENV['BUNDLE_GEMFILE'].match(/Gemfile\.ci/)
 end

data/lib/lurker/controller_spec_watcher.rb

@@ -9,10 +9,13 @@ module Lurker
     included do
       # _describe = self # RSpec::ExampleGroups::... # class
       actions = [:get, :post, :put, :delete]
-      actions << :patch if respond_to? :patch
+      if defined?(ActionDispatch::Request::HTTP_METHODS) && ActionDispatch::Request::HTTP_METHODS.include?('PATCH')
+        actions << :patch
+      end
       actions.each do |verb|
         send(:define_method, "#{verb}_with_lurker") do |*params|
           @__action, @__request_params = params
+          @__request_params ||= {}
 
           send("#{verb}_without_lurker", @__action, @__request_params)
 

data/lib/lurker/endpoint.rb

@@ -23,6 +23,11 @@ class Lurker::Endpoint
     )
   end
 
+  def persist!
+    return unless ENV['LURKER_UPGRADE']
+    schema.write_to(endpoint_path)
+  end
+
   def indexed?
     prefix.present? && description.present?
   end

data/lib/lurker/endpoint_scaffold.rb

@@ -22,7 +22,7 @@ class Lurker::EndpointScaffold < Lurker::Endpoint
   end
 
   def persist!
-    schema.write_to(endpoint_path)
+    schema.ordered!.write_to(endpoint_path)
   end
 
   def consume_request(params, successful = true)

data/lib/lurker/engine.rb

@@ -3,8 +3,10 @@ require 'lurker/server'
 module Lurker
   class Engine < ::Rails::Engine
     config.after_initialize do |app|
-      app.routes.prepend do
-        mount Lurker::Server.to_rack(path: 'html'), at: "/#{Lurker::DEFAULT_URL_BASE}"
+      app.routes.append do
+        unless ::Rails.env.production? || app.routes.routes.map(&:app).any? { |e| e.is_a?(Class) && e.name.to_s.match(/Lurker::Rack/) }
+          mount Lurker::Server.to_rack(path: 'html'), at: "/#{Lurker::DEFAULT_URL_BASE}"
+        end
       end
     end
   end

data/lib/lurker/request_spec_watcher.rb

@@ -9,7 +9,10 @@ module Lurker
     included do
       # _describe = self # RSpec::ExampleGroups::... # class
       actions = [:get, :post, :put, :delete]
-      actions << :patch if respond_to? :patch
+      if defined?(ActionDispatch::Request::HTTP_METHODS) && ActionDispatch::Request::HTTP_METHODS.include?('PATCH')
+        actions << :patch
+      end
+
       actions.each do |verb|
         send(:define_method, "#{verb}_with_lurker") do |*params|
           @__action, @__request_params, @__env = params
@@ -18,12 +21,15 @@ module Lurker
           @__query_params ||= {}
           @__env ||= {}
 
-          unless @__example.metadata.described_class.is_a?(Class)
-            raise 'cannot determine request url: provide proper described class like: "describe MyController do"'
+          if @__action.is_a?(Symbol)
+            unless @__example.metadata.described_class.is_a?(Class)
+              raise 'cannot determine request url: provide proper described class like: "describe MyController do"'
+            end
+            controller_name = @__example.metadata.described_class.name.tableize.gsub(/_controllers$/, '')
+            @__action = URI.parse(url_for({ controller: controller_name, action: @__action }.merge(@__request_params))).path
           end
 
-          controller_name = @__example.metadata.described_class.name.tableize.gsub(/_controllers$/, '')
-          @__query_params.merge! Rack::Utils.parse_query URI.parse(@__action).query
+          @__query_params.merge! ::Rack::Utils.parse_query URI.parse(@__action).query
 
           send("#{verb}_without_lurker", @__action, @__request_params, @__env)
 

data/lib/lurker/schema.rb

@@ -17,7 +17,7 @@ module Lurker
     def initialize(json_schema_hash, extensions={})
       @hash = json_schema_hash
       @extensions = if extensions.blank? && @hash.has_key?(KEY)
-        @hash.delete(KEY)
+        @hash.delete(KEY) || {}
       else
         extensions
       end
@@ -50,12 +50,22 @@ module Lurker
       FileUtils.mkdir_p(dirname) unless File.directory?(dirname)
 
       File.open(path, "w") do |file|
-        file.write(YAML.dump(Hash[@hash.sort].merge(
-          KEY => Hash[@extensions.sort]
-        )))
+        file.write(to_yaml)
       end
     end
 
+    def to_yaml
+      YAML.dump(@hash.merge(
+        KEY => @extensions
+      ))
+    end
+
+    def ordered!
+      @hash = Hash[@hash.sort]
+      @extensions = Hash[@extensions.sort]
+      self
+    end
+
     protected
 
     def serialized_for_diff

data/lib/lurker/server.rb

@@ -28,15 +28,15 @@ module Lurker
     def self.to_rack(options = {})
       default_path = options[:path] || Lurker::DEFAULT_SERVICE_PATH
 
-      Class.new(Sinatra::Base) do
+      cls = Class.new(Sinatra::Base) do
 
         if !Rails.env.development? && (username, password = options.values_at(:username, :password)).all?(&:present?)
-          use Rack::Auth::Basic, "Protected Area" do |u, p|
+          use ::Rack::Auth::Basic, "Protected Area" do |u, p|
             username == u && password == p
           end
         end
 
-        use Rack::Deflater
+        use ::Rack::Deflater
 
         use TryStatic,
          :root => "#{::Rails.root}/#{default_path}",  # static files root dir
@@ -48,6 +48,8 @@ module Lurker
          :try => ['.html', 'index.html', '/index.html'] # try these postfixes sequentially
 
       end
+      Lurker.const_set("Rack_#{rand 10}_#{Time.now.to_i}", cls)
+      cls
     end
   end
 end

data/lib/lurker/service.rb

@@ -11,17 +11,17 @@ class Lurker::Service
   end
 
   def initialize(service_dir, service_name = nil)
-    @name = service_name
     @opened_endpoints = []
     @service_dir = File.expand_path(service_dir)
+    @service_filename = service_name
     @schema = if persisted? && (schema = YAML.load_file(service_path)).is_a?(Hash)
       Lurker::Schema.new(schema)
     else
       Lurker::Schema.new({
-        'name'        => name,
+        'name'        => service_filename,
         'basePath'    => '',
         'description' => '',
-        'domains'     => {'/' => 'This host'}
+        'domains'     => {}
       })
     end
   end
@@ -31,7 +31,11 @@ class Lurker::Service
   end
 
   def service_path
-    @service_path ||= "#{service_dir}/#{name}#{SUFFIX}"
+    @service_path ||= "#{service_dir}/#{service_filename}#{SUFFIX}"
+  end
+
+  def service_filename
+    @service_filename ||= Pathname.new(Dir["#{service_dir}/*#{SUFFIX}"].first.to_s).basename.to_s.gsub(SUFFIX, '').presence || 'application'
   end
 
   def persist!
@@ -90,9 +94,7 @@ class Lurker::Service
   end
 
   def name
-    @name ||= (@schema.try(:[], 'name') ||
-               Pathname.new(Dir["#{service_dir}/*#{SUFFIX}"].first.to_s).basename.to_s.gsub(SUFFIX, '').presence ||
-               'application')
+    schema['name']
   end
 
   def base_path

data/lib/lurker/version.rb

@@ -1,3 +1,3 @@
 module Lurker
-  VERSION = "0.5.2"
+  VERSION = "0.5.3"
 end

data/lurker.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency("sinatra", "~> 1.4")
 
   # testing
+  spec.add_development_dependency("psych", "~> 2.0")
   spec.add_development_dependency("bundler", "~> 1.3")
   spec.add_development_dependency("rails", "~> 4.1")
   spec.add_development_dependency("rake", "~> 10.2")

data/spec/lurker/yaml_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+describe 'Yaml dump' do
+  it 'dumps strings with slashes' do
+    hash = { "extensions" => { "path_info" => "/api/v1/users/1/repos/1" } }
+    expect(Psych.dump(hash)).to eq(
+'---
+extensions:
+  path_info: "/api/v1/users/1/repos/1"
+'
+    )
+  end
+end

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 ENV['RAILS_ENV'] = 'test'
+require 'bundler/setup'
 require 'lurker'
 
 require 'simplecov'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lurker
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Vlad Bokov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-29 00:00:00.000000000 Z
+date: 2014-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
+- !ruby/object:Gem::Dependency
+  name: psych
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -420,6 +434,7 @@ files:
 - lib/lurker/version.rb
 - lurker.gemspec
 - spec/lurker/endpoint_spec.rb
+- spec/lurker/yaml_spec.rb
 - spec/spec_helper.rb
 - templates/generate_stuff.rb
 - templates/lurker_app.rb
@@ -463,5 +478,6 @@ test_files:
 - features/step_definitions/additional_cli_steps.rb
 - features/support/env.rb
 - spec/lurker/endpoint_spec.rb
+- spec/lurker/yaml_spec.rb
 - spec/spec_helper.rb
 has_rdoc: 

metadata.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG v1
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABCgAGBQJTXvKuAAoJENcoxKfNVdjblTIIAOhjx5x43TlPapSL7bVRj/Ln
-Z8e4j9pZLwWe22Buecz6TeuXEJcEsw++RdmSjviVdicD02yAhkHAjvwFgYuMx9FI
-q/Jhn2SZpE6sBdgP4UUMw9iXGr8ajImh/tAR7S5GVlzXpjvU3vC8MZlyNabvl6QP
-VV4N8RSzYvhUFMSfW8z1Sov7gZTmXQtpvjgjh9mIXAav1rjE+5mZuTKPvonLjxXN
-0CJu8SOsKlrSbYjoqvq1ZVxuKPW9j01ROe6HSUVAGF9Y5KcYG/EPkIOzFD7Sq3iz
-/OvlhsQpyASUnsXW0MsE4ESqzzXbhWwSF86MoW8m+Dmb1yysanLu9tgzBfro7Og=
-=CdmZ
+iQEcBAABCgAGBQJTYSdDAAoJENcoxKfNVdjbTd0H/ikPlNf2LUQtakmpxDMxCZKo
+iT3v87Ssz07yZcgt8wZDF64rVBZZ1yM2bssQftCLOvVqKGzXzlemwp7dO4m2hcBE
+8QoeueyTieMo9gN+p2/sNk3RaMwsUy4X24Q1ZSUdBiez/K8QPnjSnSeReVHBwI3X
+GDag9EdC+i79eTM+/06Ab5ReY4Wxn7w5pxRATWFrv4s0r3yElaOaARQQbH2RLe66
+KCkKSmh6QVG3f08rRkvnXyx0CbpQqSIxz6jN696z1PfeWecRBs9LYfxRSM/0BgCW
+KDSFDju69n2mNdGKNsOIicpguq8RNlG+7o3JzYyPru/4qEZfDS4uFsnZIuPxSfE=
+=kKPC
 -----END PGP SIGNATURE-----