nightcrawler_swift 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 206f894e8de465851f7a45dcea23615de0666dd4
-  data.tar.gz: 69f0ed04088e491d8d7bf1ea6e6b2c5c3bd03049
+  metadata.gz: 49eb3149824e6bb82f13aad83cbb2d39f9257c3c
+  data.tar.gz: 9350bc6a957b2d75ec215f4f2bbf8fee4a9e4b8b
 SHA512:
-  metadata.gz: 9432b08baae481fc88123911809c78ada1300653af4ecd1cadda04d5b3776bbdfdfb6288fd3284a42aacca7056632c1fd26f9bd1eb833401efdec43504eb9226
-  data.tar.gz: 1d14060fafd907d4e0185ff5612a84c087ea58234219638fae4f07eabd6d5c3d50a78b264d548d90c50e1731b60e58628a5e59267df9b8bd1ceb23536fb9b982
+  metadata.gz: 83f910d9116f65d0fb9f8f81fd39f3a4f3a35e867f2106f6d4a4994a7d8be4e715064ac10789e1567e9dc56e03133cbacc51870a032d477e4377a49bf8ea0d81
+  data.tar.gz: f203032ebc81bc80aaeb77ac147fbdc16f08b0d57bbf48aac878ae45be24209e18056b5e0d6b0af39a95f4c03de5b6a459e3c9a2f2f4a499cb467466d74cb971

data/Changelog.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.8.1
+
+  - Ensure connected on url getters `catalog, admin_url, upload_url, public_url, internal_url` (pull request #28)
+
 ## 0.8.0
 
   - Added support for ssl_version configuration

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nightcrawler_swift (0.8.0)
+    nightcrawler_swift (0.8.1)
       concurrent-ruby (~> 0.8.0)
       multi_mime (>= 1.0.1)
       rest-client

data/README.md

@@ -370,6 +370,16 @@ NightcrawlerSwift.configure tenant_name: "rogue"
 NightcrawlerSwift.options.tenant_name # "rogue"
 ```
 
+## Contributors
+
+Check it out!
+
+https://github.com/tulios/nightcrawler_swift/graphs/contributors
+
+## License
+
+See [LICENSE](https://github.com/tulios/nightcrawler_swift/blob/master/LICENSE.txt) for more details.
+
 ## Contributing
 
 1. Fork it ( https://github.com/tulios/nightcrawler_swift/fork )

data/lib/nightcrawler_swift/cli/runner.rb

@@ -105,6 +105,7 @@ module NightcrawlerSwift::CLI
       rescue
         log "Failed to restore connection, removing cache"
         File.delete cache_path
+        NightcrawlerSwift.connection.auth_response = nil
       end
     end
 

data/lib/nightcrawler_swift/connection.rb

@@ -1,7 +1,24 @@
 module NightcrawlerSwift
   class Connection
-    attr_accessor :auth_response
-    attr_reader :token_id, :expires_at, :catalog, :admin_url, :upload_url, :public_url, :internal_url
+    def self.connected_attr_reader(*args)
+      args.each do |arg|
+        define_method(arg.to_sym) do
+          connect! unless connected?
+          instance_variable_get("@#{arg}")
+        end
+      end
+    end
+
+    private_class_method :connected_attr_reader
+
+    attr_writer :auth_response
+    attr_reader :token_id, :expires_at
+    connected_attr_reader :catalog, :admin_url, :upload_url, :public_url, :internal_url
+
+    def auth_response
+      authenticate! if @auth_response.nil?
+      @auth_response
+    end
 
     def connect!
       authenticate!
@@ -58,8 +75,8 @@ module NightcrawlerSwift
     end
 
     def select_endpoints
-      raise Exceptions::ConfigurationError.new "No catalog of type 'object-store' found" if catalog.nil?
-      @endpoints = catalog["endpoints"].first
+      raise Exceptions::ConfigurationError.new "No catalog of type 'object-store' found" if @catalog.nil?
+      @endpoints = @catalog["endpoints"].first
     end
 
     def configure_urls

data/lib/nightcrawler_swift/version.rb

@@ -1,3 +1,3 @@
 module NightcrawlerSwift
-  VERSION = "0.8.0"
+  VERSION = "0.8.1"
 end

data/spec/lib/nightcrawler_swift/cli/runner_spec.rb

@@ -100,13 +100,14 @@ describe NightcrawlerSwift::CLI::Runner do
     end
 
     before do
+      allow(connection).to receive(:authenticate!)
       allow(formatter).to receive(command_method)
       allow(NightcrawlerSwift).to receive(:connection).and_return(connection)
       File.open(config_file, "w") {|f| f.write(opts.to_json)}
     end
 
     it "configures NightcrawlerSwift" do
-      expect(NightcrawlerSwift).to receive(:configure).with opts.symbolize_keys
+      expect(NightcrawlerSwift).to receive(:configure).with(opts.symbolize_keys).and_call_original
       subject.run
     end
 

data/spec/lib/nightcrawler_swift/connection_spec.rb

@@ -80,27 +80,28 @@ describe NightcrawlerSwift::Connection do
       end
 
       it "stores the catalog" do
-        subject.connect!
+        expect(subject).to receive(:connect!).and_call_original
         expect(subject.catalog).to eql(auth_success_json["access"]["serviceCatalog"][0])
       end
 
       it "stores the admin_url" do
-        subject.connect!
+        expect(subject).to receive(:connect!).and_call_original
         expect(subject.admin_url).to eql(auth_success_json["access"]["serviceCatalog"].first["endpoints"].first["adminURL"])
       end
 
       it "stores the upload_url" do
-        subject.connect!
-        expect(subject.upload_url).to eql("#{subject.admin_url}/#{opts[:bucket]}")
+        admin_url = subject.admin_url
+        expect(subject).to receive(:connect!).and_call_original
+        expect(subject.upload_url).to eql("#{admin_url}/#{opts[:bucket]}")
       end
 
       it "stores the public_url" do
-        subject.connect!
+        expect(subject).to receive(:connect!).and_call_original
         expect(subject.public_url).to eql(auth_success_json["access"]["serviceCatalog"].first["endpoints"].first["publicURL"])
       end
 
       it "stores the internal_url" do
-        subject.connect!
+        expect(subject).to receive(:connect!).and_call_original
         expect(subject.internal_url).to eql(auth_success_json["access"]["serviceCatalog"].first["endpoints"].first["internalURL"])
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nightcrawler_swift
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - tulios
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-18 00:00:00.000000000 Z
+date: 2015-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client