From 420ea26d8fd26242cafa70814f5bddbc1c4bea7e Mon Sep 17 00:00:00 2001 From: Frank Natividad Date: Thu, 22 Sep 2016 16:04:36 -0700 Subject: [PATCH] [Datastore] Updated Google Cloud Ruby Client gem from "gcloud" to "google/cloud" and necessary code. #52 --- datastore/Gemfile | 3 +- datastore/Gemfile.lock | 50 +++++----------- datastore/sample.rb | 106 +++++++++++++++++----------------- datastore/spec/sample_spec.rb | 10 ++-- 4 files changed, 75 insertions(+), 94 deletions(-) diff --git a/datastore/Gemfile b/datastore/Gemfile index 45255de53..9ccabe956 100644 --- a/datastore/Gemfile +++ b/datastore/Gemfile @@ -15,7 +15,8 @@ source "https://rubygems.org" gem "sinatra" -gem "gcloud", "~> 0.12.2" + +gem "google-cloud-datastore" group :test do gem "rspec" diff --git a/datastore/Gemfile.lock b/datastore/Gemfile.lock index 939cc3df8..2c58708ba 100644 --- a/datastore/Gemfile.lock +++ b/datastore/Gemfile.lock @@ -3,27 +3,18 @@ GEM specs: addressable (2.4.0) diff-lcs (1.2.5) - digest-crc (0.4.1) faraday (0.9.2) multipart-post (>= 1.2, < 3) - gcloud (0.12.2) - digest-crc (~> 0.4) - google-api-client (~> 0.9.11) - google-protobuf (= 3.0.0.alpha.5.0.5.1) - grpc (= 1.0.0.pre1) - mime-types (>= 2.4, < 4.0) - zonefile (~> 1.04) - google-api-client (0.9.12) - addressable (~> 2.3) - googleauth (~> 0.5) - httpclient (~> 2.7) - hurley (~> 0.1) - memoist (~> 0.11) - mime-types (>= 1.6) - representable (~> 2.3.0) - retriable (~> 2.0) - thor (~> 0.19) - google-protobuf (3.0.0.alpha.5.0.5.1) + google-cloud-core (0.20.1) + google-cloud-datastore (0.20.1) + google-cloud-core (~> 0.20.0) + google-protobuf (~> 3.0) + googleapis-common-protos (~> 1.2) + grpc (~> 1.0) + google-protobuf (3.0.2) + googleapis-common-protos (1.3.1) + google-protobuf (~> 3.0) + grpc (~> 1.0) googleauth (0.5.1) faraday (~> 0.9) jwt (~> 1.4) @@ -32,20 +23,15 @@ GEM multi_json (~> 1.11) os (~> 0.9) signet (~> 0.7) - grpc (1.0.0.pre1) - google-protobuf (~> 3.0.0.alpha.5.0.3) + grpc (1.0.0) + google-protobuf (~> 3.0) googleauth (~> 0.5.1) - httpclient (2.8.2.3) - hurley (0.2) - jwt (1.5.4) + jwt (1.5.6) little-plugger (1.1.4) logging (2.1.0) little-plugger (~> 1.1) multi_json (~> 1.10) memoist (0.15.0) - mime-types (3.1) - mime-types-data (~> 3.2015) - mime-types-data (3.2016.0521) multi_json (1.12.1) multipart-post (2.0.0) os (0.9.6) @@ -54,9 +40,6 @@ GEM rack rack-test (0.6.3) rack (>= 1.0) - representable (2.3.0) - uber (~> 0.0.7) - retriable (2.1.0) rspec (3.4.0) rspec-core (~> 3.4.0) rspec-expectations (~> 3.4.0) @@ -79,19 +62,16 @@ GEM rack (~> 1.5) rack-protection (~> 1.4) tilt (>= 1.3, < 3) - thor (0.19.1) tilt (2.0.4) - uber (0.0.15) - zonefile (1.04) PLATFORMS ruby DEPENDENCIES - gcloud (~> 0.12.2) + google-cloud-datastore rack-test rspec sinatra BUNDLED WITH - 1.12.5 + 1.13.0 diff --git a/datastore/sample.rb b/datastore/sample.rb index 57129f21e..1ef57ed75 100644 --- a/datastore/sample.rb +++ b/datastore/sample.rb @@ -12,10 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -require "gcloud" +require "google/cloud" def incomplete_key - gcloud = Gcloud.new + gcloud = Google::Cloud.new datastore = gcloud.datastore # [START incomplete_key] @@ -24,7 +24,7 @@ def incomplete_key end def named_key - gcloud = Gcloud.new + gcloud = Google::Cloud.new datastore = gcloud.datastore # [START named_key] @@ -33,7 +33,7 @@ def named_key end def key_with_parent - gcloud = Gcloud.new + gcloud = Google::Cloud.new datastore = gcloud.datastore # [START key_with_parent] @@ -44,7 +44,7 @@ def key_with_parent end def key_with_multilevel_parent - gcloud = Gcloud.new + gcloud = Google::Cloud.new datastore = gcloud.datastore # [START key_with_multilevel_parent] @@ -59,7 +59,7 @@ def key_with_multilevel_parent end def entity_with_parent - gcloud = Gcloud.new + gcloud = Google::Cloud.new datastore = gcloud.datastore # [START entity_with_parent] @@ -77,7 +77,7 @@ def entity_with_parent end def properties - gcloud = Gcloud.new + gcloud = Google::Cloud.new datastore = gcloud.datastore # [START properties] @@ -96,7 +96,7 @@ def properties end def array_value - gcloud = Gcloud.new + gcloud = Google::Cloud.new datastore = gcloud.datastore # [START array_value] @@ -108,7 +108,7 @@ def array_value end def basic_entity - gcloud = Gcloud.new + gcloud = Google::Cloud.new datastore = gcloud.datastore # [START basic_entity] @@ -124,7 +124,7 @@ def basic_entity end def upsert - gcloud = Gcloud.new + gcloud = Google::Cloud.new datastore = gcloud.datastore # [START upsert] @@ -142,7 +142,7 @@ def upsert def insert task = nil - gcloud = Gcloud.new + gcloud = Google::Cloud.new datastore = gcloud.datastore # [START insert] @@ -161,7 +161,7 @@ def insert end def lookup - gcloud = Gcloud.new + gcloud = Google::Cloud.new datastore = gcloud.datastore # [START lookup] @@ -173,7 +173,7 @@ def lookup end def update - gcloud = Gcloud.new + gcloud = Google::Cloud.new datastore = gcloud.datastore task = datastore.entity "Task", "sampleTask" do |t| @@ -196,7 +196,7 @@ def update end def delete - gcloud = Gcloud.new + gcloud = Google::Cloud.new datastore = gcloud.datastore # [START delete] @@ -208,7 +208,7 @@ def delete end def batch_upsert - gcloud = Gcloud.new + gcloud = Google::Cloud.new datastore = gcloud.datastore # [START batch_upsert] @@ -235,7 +235,7 @@ def batch_upsert end def batch_lookup - gcloud = Gcloud.new + gcloud = Google::Cloud.new datastore = gcloud.datastore # [START batch_lookup] @@ -246,7 +246,7 @@ def batch_lookup end def batch_delete - gcloud = Gcloud.new + gcloud = Google::Cloud.new datastore = gcloud.datastore # [START batch_delete] @@ -259,7 +259,7 @@ def batch_delete end def basic_query - gcloud = Gcloud.new + gcloud = Google::Cloud.new datastore = gcloud.datastore # [START basic_query] @@ -275,7 +275,7 @@ def basic_query end def property_filter - gcloud = Gcloud.new + gcloud = Google::Cloud.new datastore = gcloud.datastore # [START property_filter] @@ -285,7 +285,7 @@ def property_filter end def composite_filter - gcloud = Gcloud.new + gcloud = Google::Cloud.new datastore = gcloud.datastore # [START composite_filter] @@ -296,7 +296,7 @@ def composite_filter end def key_filter - gcloud = Gcloud.new + gcloud = Google::Cloud.new datastore = gcloud.datastore # [START key_filter] @@ -306,7 +306,7 @@ def key_filter end def ascending_sort - gcloud = Gcloud.new + gcloud = Google::Cloud.new datastore = gcloud.datastore # [START ascending_sort] @@ -316,7 +316,7 @@ def ascending_sort end def descending_sort - gcloud = Gcloud.new + gcloud = Google::Cloud.new datastore = gcloud.datastore # [START descending_sort] @@ -326,7 +326,7 @@ def descending_sort end def multi_sort - gcloud = Gcloud.new + gcloud = Google::Cloud.new datastore = gcloud.datastore # [START multi_sort] @@ -337,12 +337,12 @@ def multi_sort end def kindless_query - gcloud = Gcloud.new + gcloud = Google::Cloud.new datastore = gcloud.datastore last_seen_key = datastore.key "Task", "a" # [START kindless_query] - query = Gcloud::Datastore::Query.new + query = Google::Cloud::Datastore::Query.new query.where("__key__", ">", last_seen_key) # [END kindless_query] @@ -350,7 +350,7 @@ def kindless_query end def ancestor_query - gcloud = Gcloud.new + gcloud = Google::Cloud.new datastore = gcloud.datastore # [START ancestor_query] @@ -362,7 +362,7 @@ def ancestor_query end def projection_query - gcloud = Gcloud.new + gcloud = Google::Cloud.new datastore = gcloud.datastore # [START projection_query] @@ -383,7 +383,7 @@ def projection_query end def keys_only_query - gcloud = Gcloud.new + gcloud = Google::Cloud.new datastore = gcloud.datastore # [START keys_only_query] @@ -397,7 +397,7 @@ def keys_only_query end def distinct_query - gcloud = Gcloud.new + gcloud = Google::Cloud.new datastore = gcloud.datastore # [START distinct_query] @@ -410,7 +410,7 @@ def distinct_query end def distinct_on_query - gcloud = Gcloud.new + gcloud = Google::Cloud.new datastore = gcloud.datastore # [START distinct_on_query] @@ -423,7 +423,7 @@ def distinct_on_query end def array_value_inequality_range - gcloud = Gcloud.new + gcloud = Google::Cloud.new datastore = gcloud.datastore # [START array_value_inequality_range] @@ -434,7 +434,7 @@ def array_value_inequality_range end def array_value_equality - gcloud = Gcloud.new + gcloud = Google::Cloud.new datastore = gcloud.datastore # [START array_value_equality] @@ -445,7 +445,7 @@ def array_value_equality end def inequality_range - gcloud = Gcloud.new + gcloud = Google::Cloud.new datastore = gcloud.datastore # [START inequality_range] @@ -456,7 +456,7 @@ def inequality_range end def inequality_invalid - gcloud = Gcloud.new + gcloud = Google::Cloud.new datastore = gcloud.datastore # [START inequality_invalid] @@ -467,7 +467,7 @@ def inequality_invalid end def equal_and_inequality_range - gcloud = Gcloud.new + gcloud = Google::Cloud.new datastore = gcloud.datastore # [START equal_and_inequality_range] @@ -480,7 +480,7 @@ def equal_and_inequality_range end def inequality_sort - gcloud = Gcloud.new + gcloud = Google::Cloud.new datastore = gcloud.datastore # [START inequality_sort] @@ -492,7 +492,7 @@ def inequality_sort end def inequality_sort_invalid_not_same - gcloud = Gcloud.new + gcloud = Google::Cloud.new datastore = gcloud.datastore # [START inequality_sort_invalid_not_same] @@ -503,7 +503,7 @@ def inequality_sort_invalid_not_same end def inequality_sort_invalid_not_first - gcloud = Gcloud.new + gcloud = Google::Cloud.new datastore = gcloud.datastore # [START inequality_sort_invalid_not_first] @@ -515,7 +515,7 @@ def inequality_sort_invalid_not_first end def limit - gcloud = Gcloud.new + gcloud = Google::Cloud.new datastore = gcloud.datastore # [START limit] @@ -525,7 +525,7 @@ def limit end def cursor_paging - gcloud = Gcloud.new + gcloud = Google::Cloud.new datastore = gcloud.datastore page_size = 2 @@ -556,7 +556,7 @@ def eventual_consistent_query end def unindexed_property_query - gcloud = Gcloud.new + gcloud = Google::Cloud.new datastore = gcloud.datastore # [START unindexed_property_query] @@ -566,7 +566,7 @@ def unindexed_property_query end def exploding_properties - gcloud = Gcloud.new + gcloud = Google::Cloud.new datastore = gcloud.datastore # [START exploding_properties] @@ -595,7 +595,7 @@ def transactional_retry from_key, to_key, amount (1..5).each do |i| begin return transfer_funds from_key, to_key, amount - rescue Gcloud::Error => e + rescue Google::Cloud::Error => e raise e if i == 5 end end @@ -635,7 +635,7 @@ def transactional_single_entity_group_read_only end def namespace_run_query - gcloud = Gcloud.new + gcloud = Google::Cloud.new datastore = gcloud.datastore # [START namespace_run_query] @@ -651,7 +651,7 @@ def namespace_run_query end def kind_run_query - gcloud = Gcloud.new + gcloud = Google::Cloud.new datastore = gcloud.datastore # [START kind_run_query] @@ -665,7 +665,7 @@ def kind_run_query end def property_run_query - gcloud = Gcloud.new + gcloud = Google::Cloud.new datastore = gcloud.datastore # [START property_run_query] @@ -683,7 +683,7 @@ def property_run_query end def property_by_kind_run_query - gcloud = Gcloud.new + gcloud = Google::Cloud.new datastore = gcloud.datastore # [START property_by_kind_run_query] @@ -701,7 +701,7 @@ def property_by_kind_run_query end def property_filtering_run_query - gcloud = Gcloud.new + gcloud = Google::Cloud.new datastore = gcloud.datastore # [START property_filtering_run_query] @@ -722,7 +722,7 @@ def property_filtering_run_query def gql_run_query # [START gql_run_query] - gql_query = Gcloud::Datastore::GqlQuery.new + gql_query = Google::Cloud::Datastore::GqlQuery.new gql_query.query_string = "SELECT * FROM Task ORDER BY created ASC" tasks = datastore.run gql_query # [END gql_run_query] @@ -730,7 +730,7 @@ def gql_run_query def gql_named_binding_query # [START gql_named_binding_query] - gql_query = Gcloud::Datastore::GqlQuery.new + gql_query = Google::Cloud::Datastore::GqlQuery.new gql_query.query_string = "SELECT * FROM Task " \ "WHERE done = @done AND priority = @priority" gql_query.named_bindings = { done: false, priority: 4 } @@ -741,7 +741,7 @@ def gql_named_binding_query def gql_positional_binding_query # [START gql_positional_binding_query] - gql_query = Gcloud::Datastore::GqlQuery.new + gql_query = Google::Cloud::Datastore::GqlQuery.new gql_query.query_string = "SELECT * FROM Task " \ "WHERE done = @1 AND priority = @2" gql_query.positional_bindings = [false, 4] @@ -752,7 +752,7 @@ def gql_positional_binding_query def gql_literal_query # [START gql_literal_query] - gql_query = Gcloud::Datastore::GqlQuery.new + gql_query = Google::Cloud::Datastore::GqlQuery.new gql_query.query_string = "SELECT * FROM Task " \ "WHERE done = false AND priority = 4" gql_query.allow_literals = true diff --git a/datastore/spec/sample_spec.rb b/datastore/spec/sample_spec.rb index 861c5b8d1..70368f65d 100644 --- a/datastore/spec/sample_spec.rb +++ b/datastore/spec/sample_spec.rb @@ -19,7 +19,7 @@ attr_reader :datastore before :all do - @gcloud = Gcloud.new + @gcloud = Google::Cloud.new @datastore = @gcloud.datastore task_list = datastore.entity "TaskList", "default" @@ -34,7 +34,7 @@ end before :each do - allow(Gcloud).to receive(:new).and_return(@gcloud) + allow(Google::Cloud).to receive(:new).and_return(@gcloud) end after :all do @@ -350,7 +350,7 @@ def delete_accounts it "throws when inequality_invalid" do query = inequality_invalid - expect { datastore.run(query) }.to raise_error(Gcloud::InvalidArgumentError) + expect { datastore.run(query) }.to raise_error(Google::Cloud::InvalidArgumentError) end it "supports equal_and_inequality_range" do @@ -375,13 +375,13 @@ def delete_accounts it "supports inequality_sort_invalid_not_same" do query = inequality_sort_invalid_not_same - expect { datastore.run(query) }.to raise_error(Gcloud::InvalidArgumentError) + expect { datastore.run(query) }.to raise_error(Google::Cloud::InvalidArgumentError) end it "supports inequality_sort_invalid_not_first" do query = inequality_sort_invalid_not_first - expect { datastore.run(query) }.to raise_error(Gcloud::InvalidArgumentError) + expect { datastore.run(query) }.to raise_error(Google::Cloud::InvalidArgumentError) end it "supports limit" do